From cd540090dd63501b616164e7545bb27942d13aee Mon Sep 17 00:00:00 2001 From: Ilya Shakhat Date: Sun, 8 Mar 2020 22:31:00 +0400 Subject: [PATCH] Cap requirements for Python version below 3.6 OpenStack drops support for py27 starting with Ussuri release. All new libraries are tested against py36 and py37 only, older versions support py27 and py35. This patch caps dependency's versions for py<3.6 and keeps them open for py>=3.6. Change-Id: I1edc4893d2699529385fabd2d6ac25ccef18b2d9 --- requirements.txt | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index c31c244..2246367 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,21 +6,30 @@ pbr>=1.8 # Apache-2.0 diskimage-builder>=1.1.2,!=1.6.0,!=1.7.0,!=1.7.1 # Apache-2.0 iso8601>=0.1.11 # MIT -Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) -keystoneauth1>=2.18.0 # Apache-2.0 +Jinja2>=2.10.1,<3.0.0 # BSD License (3 clause) +keystoneauth1>=2.18.0,<=3.18.0;python_version<'3.6' # Apache-2.0 +keystoneauth1>=2.18.0;python_version>='3.6' # Apache-2.0 os-client-config>=1.22.0,<1.31.0 # Apache-2.0 -oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 -oslo.i18n>=2.1.0 # Apache-2.0 -oslo.log>=3.11.0 # Apache-2.0 -oslo.serialization>=1.10.0 # Apache-2.0 -oslo.utils>=3.18.0 # Apache-2.0 +oslo.concurrency>=3.8.0,<4.0.0;python_version<'3.6' # Apache-2.0 +oslo.concurrency>=3.8.0;python_version>='3.6' # Apache-2.0 +oslo.config!=3.18.0,>=3.14.0,<8.0.0;python_version<'3.6' # Apache-2.0 +oslo.config!=3.18.0,>=3.14.0;python_version>='3.6' # Apache-2.0 +oslo.log>=3.11.0,<4.0.0;python_version<'3.6' # Apache-2.0 +oslo.log>=3.11.0;python_version>='3.6' # Apache-2.0 +oslo.serialization>=1.10.0,<3.0.0;python_version<'3.6' # Apache-2.0 +oslo.serialization>=1.10.0;python_version>='3.6' # Apache-2.0 +oslo.utils>=3.18.0,<4.0.0;python_version<'3.6' # Apache-2.0 +oslo.utils>=3.18.0;python_version>='3.6' # Apache-2.0 pygal pykwalify -python-glanceclient>=2.5.0 # Apache-2.0 -python-neutronclient>=5.1.0 # Apache-2.0 -python-novaclient>=7.1.0 # Apache-2.0 -python-heatclient>=1.6.1 # Apache-2.0 +python-glanceclient>=2.5.0,<=3.0.0;python_version<'3.6' # Apache-2.0 +python-glanceclient>=2.5.0;python_version>='3.6' # Apache-2.0 +python-neutronclient>=5.1.0,<8.0.0;python_version<'3.6' # Apache-2.0 +python-neutronclient>=5.1.0;python_version>='3.6' # Apache-2.0 +python-novaclient>=7.1.0,<17.0.0;python_version<'3.6' # Apache-2.0 +python-novaclient>=7.1.0;python_version>='3.6' # Apache-2.0 +python-heatclient>=1.6.1,<2.0.0;python_version<'3.6' # Apache-2.0 +python-heatclient>=1.6.1;python_version>='3.6' # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD PyYAML>=3.10.0 # MIT pyzmq>=16.0 # LGPL+BSD