From 14cab0efc38cddb19c8b1e8cf46a74f66f38419e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 5 Nov 2018 19:23:47 +0000 Subject: [PATCH 1/6] Update README; python 3.3 is no longer supported. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 568b8387c..8b99b8ec8 100644 --- a/README.md +++ b/README.md @@ -91,4 +91,4 @@ file and [list of open issues](https://github.com/dulwich/dulwich/issues). Supported versions of Python ---------------------------- -At the moment, Dulwich supports (and is tested on) CPython 2.7, 3.3, 3.4, 3.5, 3.6 and Pypy. +At the moment, Dulwich supports (and is tested on) CPython 2.7, 3.4, 3.5, 3.6 and Pypy. From 1aab558956ae14ea9c0ea28f9527184042e72ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 5 Nov 2018 21:03:23 +0000 Subject: [PATCH 2/6] Start on 0.19.8. --- NEWS | 2 ++ dulwich/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a3643bb60..f347c0ea1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +0.19.8 UNRELEASED + 0.19.7 2018-11-05 CHANGES diff --git a/dulwich/__init__.py b/dulwich/__init__.py index b42e4aaa7..e06006db9 100644 --- a/dulwich/__init__.py +++ b/dulwich/__init__.py @@ -22,4 +22,4 @@ """Python implementation of the Git file formats and protocols.""" -__version__ = (0, 19, 7) +__version__ = (0, 19, 8) diff --git a/setup.py b/setup.py index 8319fc1d8..79db7b123 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ import os import sys -dulwich_version_string = '0.19.7' +dulwich_version_string = '0.19.8' include_dirs = [] # Windows MSVC support From 29fd29e67a04aaaf815dde051e6c0888d28e8ac8 Mon Sep 17 00:00:00 2001 From: egor Date: Tue, 6 Nov 2018 22:25:00 +0000 Subject: [PATCH 3/6] Fix setup.py: * read "README.md" with "utf-8" encoding --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 79db7b123..57dd916ac 100755 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ else: has_setuptools = True from distutils.core import Distribution +import io import os import sys @@ -83,7 +84,8 @@ def has_ext_modules(self): setup_kwargs['test_suite'] = 'dulwich.tests.test_suite' setup_kwargs['tests_require'] = tests_require -with open('README.md', 'r') as f: +with io.open(os.path.join(os.path.dirname(__file__), "README.md"), + encoding="utf-8") as f: description = f.read() setup(name='dulwich', From 8e7be098708f7ef549ef5f73e56918143d094d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 7 Nov 2018 01:13:46 +0000 Subject: [PATCH 4/6] Update NEWS for #668. --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index f347c0ea1..fbebc5cc3 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ 0.19.8 UNRELEASED + * Fix encoding when reading README file in setup.py. + (egor , #668) + 0.19.7 2018-11-05 CHANGES From 98f38dd6ae14a1abb53c669e8a3878b224c6489e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 7 Nov 2018 01:16:05 +0000 Subject: [PATCH 5/6] Skip cyrrilic test on windows; doesn't support arbitrary bytes in paths. --- dulwich/tests/test_refs.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dulwich/tests/test_refs.py b/dulwich/tests/test_refs.py index ee9611f71..e1b036640 100644 --- a/dulwich/tests/test_refs.py +++ b/dulwich/tests/test_refs.py @@ -506,6 +506,9 @@ def test_non_ascii(self): self.assertEqual(expected_refs, self._repo.get_refs()) def test_cyrillic(self): + if sys.platform == 'win32': + raise SkipTest( + "filesystem encoding doesn't support arbitrary bytes") # reported in https://github.com/dulwich/dulwich/issues/608 name = b'\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' encoded_ref = b'refs/heads/' + name From b266a2762e28b11d1bd08f808e5791849464df3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 7 Nov 2018 01:47:49 +0000 Subject: [PATCH 6/6] Release 0.19.8 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index fbebc5cc3..a9ec9da05 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -0.19.8 UNRELEASED +0.19.8 2018-11-06 * Fix encoding when reading README file in setup.py. (egor , #668)