Merge pull request #253 from jelmer/dulwich-python2
Use an older version of Dulwich on Python 2
Jonas Haag authored 1 year, 11 months ago
GitHub committed 1 year, 11 months ago
141 | 141 |
|
142 | 142 |
def get_tag_and_branch_shas(self):
|
143 | 143 |
"""Return a list of SHAs of all tags and branches."""
|
144 | |
tag_shas = self.get_refs_as_dict('refs/tags/').values()
|
145 | |
branch_shas = self.get_refs_as_dict('refs/heads/').values()
|
|
144 |
tag_shas = self.get_refs_as_dict(b'refs/tags/').values()
|
|
145 |
branch_shas = self.get_refs_as_dict(b'refs/heads/').values()
|
146 | 146 |
return set(tag_shas) | set(branch_shas)
|
147 | 147 |
|
148 | 148 |
def history(self, commit, path=None, max_commits=None, skip=0):
|
13 | 13 |
|
14 | 14 |
install_data_files_hack()
|
15 | 15 |
|
16 | |
requires = ['six', 'flask', 'Werkzeug>=0.15.0', 'pygments', 'dulwich>=0.19.3', 'httpauth', 'humanize']
|
|
16 |
requires = ['six', 'flask', 'Werkzeug>=0.15.0', 'pygments', 'httpauth', 'humanize', 'dulwich>=0.19.3;python_version>="3.5"', 'dulwich>=0.19.3,<0.20;python_version<"3.5"']
|
17 | 17 |
|
18 | 18 |
setup(
|
19 | 19 |
name='klaus',
|
12 | 12 |
manpage = force_unicode(subprocess.check_output(["man", "./klaus.1"]))
|
13 | 13 |
|
14 | 14 |
def assert_in_manpage(s):
|
15 | |
clean = lambda x: re.sub('(.\\x08)|\s', '', x)
|
|
15 |
clean = lambda x: re.sub('(.\\x08)|\\s', '', x)
|
16 | 16 |
assert clean(s) in clean(manpage), "%r not found in manpage" % s
|
17 | 17 |
|
18 | 18 |
mock_parser = mock.Mock()
|