From 65f741eca4d6e5082637057654671abd61ee9e25 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Wed, 22 Mar 2017 23:49:52 +0300 Subject: [PATCH 1/4] enforce aiohttp<2.0 aiohttp>=2.0 will be supported in the next releases. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 901ad5d..875fb81 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,7 @@ def read_file(filename): ], test_suite="tests", install_requires=[ - "aiohttp>=1.1", + "aiohttp>=1.1,<2.0", ], extras_require={ # TODO: Rich comparison in environment markers are broken in From f6730a0393789192141d1aba313d9ea2ceb25b25 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Wed, 22 Mar 2017 23:50:30 +0300 Subject: [PATCH 2/4] prepare 0.5.1 release --- CHANGES.rst | 8 +++++++- aiohttp_cors/__about__.py | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index e3ba630..31de062 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,16 @@ CHANGES ======= +0.5.1 (2017-03-23) +------------------ + +- Enforce ``aiohttp`` version to be less than 2.0. + Newer ``aiohttp`` releases will be supported in the next release. + 0.5.0 (2016-11-18) ------------------ -- Fix compatibility with aiohttp 1.1 +- Fix compatibility with ``aiohttp`` 1.1 0.4.0 (2016-04-04) diff --git a/aiohttp_cors/__about__.py b/aiohttp_cors/__about__.py index 6a0b376..9b8947a 100644 --- a/aiohttp_cors/__about__.py +++ b/aiohttp_cors/__about__.py @@ -19,10 +19,10 @@ """ __title__ = "aiohttp-cors" -__version__ = "0.5.0" +__version__ = "0.5.1" __author__ = "Vladimir Rutsky" __email__ = "vladimir@rutsky.org" __summary__ = "CORS support for aiohttp" __uri__ = "https://github.com/aio-libs/aiohttp-cors" __license__ = "Apache License, Version 2.0" -__copyright__ = "2015, 2016 {}".format(__author__) +__copyright__ = "2015, 2016, 2017 {}".format(__author__) From c717feef651bd300421efb90e46e1dcdfe8c7c30 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 23 Mar 2017 00:00:44 +0300 Subject: [PATCH 3/4] remove unneeded self-installation It's already done in requirements-dev.txt --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5b5c8d8..eba46b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ before_install: install: - pip install --upgrade pip setuptools wheel - pip install -Ur requirements-dev.txt -- python setup.py develop # aiohttp git repo has only *.pyx files, so install cython too. - '[ -z "$MASTER_AIOHTTP" ] || pip install -U cython git+https://github.com/KeepSafe/aiohttp.git' From 5f27320d80911d0519ca53d86f84862fd28424d1 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 23 Mar 2017 00:01:21 +0300 Subject: [PATCH 4/4] install master version of aiohttp before aiohttp_cors This way if aiohttp_cors specifically requires some version of aiohttp (e.g. "aiohttp<2.0"), compatible version of aiohttp should be installed. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eba46b4..a8c2c7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ before_install: install: - pip install --upgrade pip setuptools wheel -- pip install -Ur requirements-dev.txt # aiohttp git repo has only *.pyx files, so install cython too. - '[ -z "$MASTER_AIOHTTP" ] || pip install -U cython git+https://github.com/KeepSafe/aiohttp.git' +- pip install -Ur requirements-dev.txt before_script: # Start X-server for Selenium tests.