From fdf698e5cccd2ccf63711f1ef4841aac1f1d636a Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Fri, 2 Dec 2016 10:55:35 +0000 Subject: [PATCH 1/3] Pin out hyper-h2 2.5.0. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0d36afaa..cedea1e4 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ def run_tests(self): 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: Implementation :: CPython', ], - install_requires=['h2>=2.4,<3.0', 'hyperframe>=3.2,<4.0'], + install_requires=['h2>=2.4,<3.0,!=2.5.0', 'hyperframe>=3.2,<4.0'], tests_require=['pytest', 'requests', 'mock'], cmdclass={'test': PyTest}, entry_points={ From 30413013b09b90de63b3bd6e375ae47b0d63ec1a Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Fri, 2 Dec 2016 11:12:39 +0000 Subject: [PATCH 2/3] Skip import tests on wrong platforms. --- test/test_import.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_import.py b/test/test_import.py index b8e3a1f2..9da32bd5 100644 --- a/test/test_import.py +++ b/test/test_import.py @@ -5,6 +5,7 @@ class TestImportPython2(object): + @pytest.mark.skipif(sys.version_info[0] == 3, reason="Python 2 only") def test_cannot_import_python_2(self, monkeypatch): monkeypatch.setattr(sys, 'version_info', (2, 6, 5, 'final', 0)) with pytest.raises(ImportError): @@ -12,6 +13,7 @@ def test_cannot_import_python_2(self, monkeypatch): class TestImportPython3(object): + @pytest.mark.skipif(sys.version_info[0] == 2, reason="Python 3 only") def test_cannot_import_python_32(self, monkeypatch): monkeypatch.setattr(sys, 'version_info', (3, 2, 3, 'final', 0)) with pytest.raises(ImportError): From 3475cc2808250fb3b5715c04106ddaa494a51e10 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Fri, 2 Dec 2016 11:21:54 +0000 Subject: [PATCH 3/3] Extra space for flake8 --- hyper/ssl_compat.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hyper/ssl_compat.py b/hyper/ssl_compat.py index 976b6235..71ebcd3a 100644 --- a/hyper/ssl_compat.py +++ b/hyper/ssl_compat.py @@ -48,6 +48,7 @@ def inner(self, *args, **kwargs): return getattr(self._conn, method)(*args, **kwargs) return inner + # Referenced in hyper/http20/connection.py. These values come # from the python ssl package, and must be defined in this file # for hyper to work in python versions <2.7.9