update requirements and constraints for py3 only Victoria

generate-constraints -b blacklist.txt -p /usr/bin/python3.6 -p /usr/bin/python3.8 -r global-requirements.txt

Change-Id: I2d58d1b524764ea1d46d6ab3a382783f6a002b34
Signed-off-by: Matthew Thode <mthode@mthode.org>
This commit is contained in:
Matthew Thode 2020-04-15 13:46:54 -05:00
parent 32477163f3
commit d0b389d840
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
8 changed files with 224 additions and 747 deletions

View File

@ -108,15 +108,6 @@
vars: vars:
tox_envlist: py36 tox_envlist: py36
- job:
name: cross-nova-py37
parent: requirements-cross-test
description: Run cross-project tests on nova with py37.
required-projects: openstack/nova
vars:
tox_envlist: py37
python_version: 3.7
- job: - job:
name: cross-octavia-py36 name: cross-octavia-py36
parent: requirements-cross-test parent: requirements-cross-test
@ -125,15 +116,6 @@
vars: vars:
tox_envlist: py36 tox_envlist: py36
- job:
name: cross-octavia-py37
parent: requirements-cross-test
description: Run cross-project tests on octavia with py37.
required-projects: openstack/octavia
vars:
tox_envlist: py37
python_version: 3.7
- job: - job:
name: cross-swift-py27 name: cross-swift-py27
parent: requirements-cross-test parent: requirements-cross-test

View File

@ -22,6 +22,16 @@
files: ^upper-constraints.*txt$ files: ^upper-constraints.*txt$
vars: vars:
tox_envlist: py36-check-uc tox_envlist: py36-check-uc
- job:
name: requirements-tox-py38-check-uc
parent: openstack-tox-py38
description: |
Run test for requirements project.
Uses tox with the ``py38-check-uc`` environment.
files: ^upper-constraints.*txt$
vars:
tox_envlist: py38-check-uc
- job: - job:
name: requirements-tox-validate-projects name: requirements-tox-validate-projects
parent: openstack-tox parent: openstack-tox

View File

@ -17,6 +17,7 @@
- requirements-tox-bindep: - requirements-tox-bindep:
voting: false voting: false
- requirements-tox-py36-check-uc - requirements-tox-py36-check-uc
- requirements-tox-py38-check-uc
- requirements-tox-validate-projects: - requirements-tox-validate-projects:
voting: false voting: false
- cross-cinder-py36 - cross-cinder-py36
@ -26,12 +27,9 @@
- cross-keystone-py36 - cross-keystone-py36
- cross-neutron-py36 - cross-neutron-py36
- cross-nova-py36 - cross-nova-py36
- cross-nova-py37
- cross-nova-functional - cross-nova-functional
- cross-octavia-py36 - cross-octavia-py36
- cross-octavia-py37
- cross-osc-tox-docs - cross-osc-tox-docs
- cross-swift-py27
- cross-swift-py36 - cross-swift-py36
- openstack-tox-py36 - openstack-tox-py36
- openstacksdk-functional-devstack - openstacksdk-functional-devstack
@ -61,6 +59,7 @@
- openstack-tox-validate - openstack-tox-validate
- requirements-tox-babel - requirements-tox-babel
- requirements-tox-py36-check-uc - requirements-tox-py36-check-uc
- requirements-tox-py38-check-uc
- cross-cinder-py36 - cross-cinder-py36
- cross-glance-py36 - cross-glance-py36
- cross-horizon-py36 - cross-horizon-py36
@ -69,11 +68,8 @@
- cross-neutron-py36 - cross-neutron-py36
- cross-nova-py36: - cross-nova-py36:
files: ^upper-constraints.txt$ files: ^upper-constraints.txt$
- cross-nova-py37:
files: ^upper-constraints.txt$
- cross-nova-functional - cross-nova-functional
- cross-octavia-py36 - cross-octavia-py36
- cross-octavia-py37
- cross-osc-tox-docs - cross-osc-tox-docs
- cross-swift-py27 - cross-swift-py27
- cross-swift-py36 - cross-swift-py36

View File

@ -22,30 +22,25 @@ castellan # Apache-2.0
ceilometermiddleware # Apache-2.0 ceilometermiddleware # Apache-2.0
cachetools # MIT License cachetools # MIT License
cffi # MIT cffi # MIT
cliff!=2.9.0,!=2.17.0,<3.0.0;python_version=='2.7' # Apache-2.0 cliff!=2.9.0,!=2.17.0 # Apache-2.0
cliff!=2.9.0,!=2.17.0;python_version>='3.6' # Apache-2.0
# NOTE(mordred) python-openstackclient is broken due to bug 1810213 # NOTE(mordred) python-openstackclient is broken due to bug 1810213
cmd2!=0.8.3,<0.9.0 # MIT cmd2!=0.8.3,<0.9.0 # MIT
confluent-kafka!=1.4.0 # Apache-2.0 confluent-kafka!=1.4.0 # Apache-2.0
cotyledon # Apache-2.0 cotyledon # Apache-2.0
construct<2.10.55;python_version=='2.7' # MIT construct # MIT
construct;python_version>='3.6' # MIT
PuLP # MIT PuLP # MIT
contextlib2;python_version<'3.0' # PSF License
croniter # MIT License croniter # MIT License
cryptography!=2.0 # BSD/Apache-2.0 cryptography!=2.0 # BSD/Apache-2.0
cursive # Apache-2.0 cursive # Apache-2.0
dataclasses;python_version=='3.6' # Apache-2.0 dataclasses;python_version=='3.6' # Apache-2.0
ddt # MIT ddt # MIT
debtcollector<2.0.0;python_version<'3.0' # Apache-2.0 debtcollector # Apache-2.0
debtcollector;python_version>='3.0' # Apache-2.0
decorator # BSD decorator # BSD
defusedxml # PSF defusedxml # PSF
dib-utils # Apache-2.0 dib-utils # Apache-2.0
diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1 # Apache-2.0 diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1 # Apache-2.0
distro # Apache-2.0 distro # Apache-2.0
Django<2;python_version<'3.0' # BSD Django<3.0 # BSD
Django<3.0;python_version>='3.0' # BSD
django-compressor # MIT django-compressor # MIT
django-debreach # BSD django-debreach # BSD
django-formtools # BSD django-formtools # BSD
@ -59,8 +54,7 @@ dogtag-pki # LGPLv3+
dulwich!=0.19.3,!=0.19.7 # Apache-2.0 dulwich!=0.19.3,!=0.19.7 # Apache-2.0
edgegrid-python # Apache-2.0 edgegrid-python # Apache-2.0
elasticsearch<3.0.0 # Apache-2.0 elasticsearch<3.0.0 # Apache-2.0
enmerkar;python_version>='3.0' # BSD enmerkar # BSD
enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
# NOTE: New versions of eventlet should not be accepted lightly # NOTE: New versions of eventlet should not be accepted lightly
# as they have earned a reputation of frequently breaking things. # as they have earned a reputation of frequently breaking things.
eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0 # MIT eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0 # MIT
@ -69,19 +63,13 @@ extras # MIT
falcon # Apache-2.0 falcon # Apache-2.0
Flask!=0.11 # BSD Flask!=0.11 # BSD
Flask-RESTful # BSD Flask-RESTful # BSD
futures!=0.17.0;python_version=='2.7' or python_version=='2.6' # PSF futurist # Apache-2.0
futurist<2.0.0;python_version=='2.7' # Apache-2.0
futurist;python_version>='3.6' # Apache-2.0
funcsigs;python_version=='2.7' or python_version=='2.6' # Apache-2.0
glance-store!=0.29.0 # Apache-2.0 glance-store!=0.29.0 # Apache-2.0
google-api-python-client # Apache-2.0 google-api-python-client # Apache-2.0
graphviz!=0.5.0 # MIT License graphviz!=0.5.0 # MIT License
greenlet!=0.4.14 # MIT greenlet!=0.4.14 # MIT
GitPython<2.1.12;python_version<'3.0' # BSD License (3 clause) GitPython # BSD License (3 clause)
GitPython;python_version>='3.0' # BSD License (3 clause) gunicorn # MIT
gunicorn<20.0.0;python_version<'3.0' # MIT
gunicorn;python_version>='3.0' # MIT
happybase!=0.7,!=1.0.0;python_version=='2.7' # MIT
heat-translator # Apache-2.0 heat-translator # Apache-2.0
horizon # Apache-2.0 horizon # Apache-2.0
httplib2 # MIT httplib2 # MIT
@ -89,10 +77,8 @@ hvac # Apache-2.0
icalendar # BSD icalendar # BSD
importlib-metadata # Apache-2.0 importlib-metadata # Apache-2.0
infinisdk # BSD-3 infinisdk # BSD-3
influxdb!=5.2.0,!=5.2.1,!=5.2.2,!=5.2.3;python_version<'3.0' # MIT influxdb!=5.3.0 # MIT
influxdb!=5.3.0;python_version>='3.0' # MIT
ironic-lib # Apache-2.0 ironic-lib # Apache-2.0
ipaddress;python_version<'3.3' # PSF
iso8601 # MIT iso8601 # MIT
jira # BSD License (2 clause) jira # BSD License (2 clause)
Jinja2 # BSD License (3 clause) Jinja2 # BSD License (3 clause)
@ -115,8 +101,7 @@ django-pyscss # BSD License (2 clause)
kombu!=4.0.2 # BSD kombu!=4.0.2 # BSD
ldap3 # LGPLv3 ldap3 # LGPLv3
deprecation # Apache-2.0 deprecation # Apache-2.0
libvirt-python!=4.1.0,!=4.2.0,<6.0.0;python_version<'3.0' # LGPLv2+ libvirt-python!=4.1.0,!=4.2.0 # LGPLv2+
libvirt-python!=4.1.0,!=4.2.0;python_version>='3.0' # LGPLv2+
lxml!=3.7.0 # BSD lxml!=3.7.0 # BSD
Mako # MIT Mako # MIT
marathon!=0.9.1 # MIT marathon!=0.9.1 # MIT
@ -125,12 +110,10 @@ microversion-parse # Apache-2.0
mistral-lib # Apache-2.0 mistral-lib # Apache-2.0
monasca-common # Apache-2.0 monasca-common # Apache-2.0
monasca-statsd # Apache-2.0 monasca-statsd # Apache-2.0
monotonic;python_version<'3.3' # Apache-2.0
msgpack # Apache-2.0 msgpack # Apache-2.0
munch # MIT munch # MIT
murano-pkg-check # Apache-2.0 murano-pkg-check # Apache-2.0
mypy;python_version>='3.4' # MIT mypy # MIT
ndg-httpsclient;python_version<'3.0' # BSD
netaddr # BSD netaddr # BSD
netifaces!=0.10.0,!=0.10.1 # MIT netifaces!=0.10.0,!=0.10.1 # MIT
netmiko # MIT netmiko # MIT
@ -140,11 +123,9 @@ networking-l2gw # Apache-2.0
networking-odl # Apache-2.0 networking-odl # Apache-2.0
networking-sfc # Apache-2.0 networking-sfc # Apache-2.0
# NOTE(fdegir): NetworkX 2.3 dropped support for Python 2 # NOTE(fdegir): NetworkX 2.3 dropped support for Python 2
networkx<2.3;python_version<'3.0' # BSD networkx # BSD
networkx;python_version>='3.4' # BSD
# NOTE(ralonsoh): neutron-lib 2.0.0 dropped support for Python 2 # NOTE(ralonsoh): neutron-lib 2.0.0 dropped support for Python 2
neutron-lib<2.0.0;python_version=='2.7' # Apache-2.0 neutron-lib # Apache-2.0
neutron-lib;python_version>='3.6' # Apache-2.0
neutron-dynamic-routing # Apache-2.0 neutron-dynamic-routing # Apache-2.0
neutron-fwaas # Apache-2.0 neutron-fwaas # Apache-2.0
neutron # Apache-2.0 neutron # Apache-2.0
@ -155,42 +136,28 @@ octavia-lib # Apache-2.0
openstackdocstheme!=2.1.0 # Apache-2.0 openstackdocstheme!=2.1.0 # Apache-2.0
osc-lib # Apache-2.0 osc-lib # Apache-2.0
osc-placement # Apache-2.0 osc-placement # Apache-2.0
oslo.cache!=1.31.1,<2.0.0;python_version<'3.0' # Apache-2.0 oslo.cache!=1.31.1,!=2.1.0 # Apache-2.0
oslo.cache!=1.31.1,!=2.1.0;python_version>='3.0' # Apache-2.0 oslo.config!=4.3.0,!=4.4.0 # Apache-2.0
oslo.config!=4.3.0,!=4.4.0,<8.0.0;python_version<'3.0' # Apache-2.0 oslo.concurrency # Apache-2.0
oslo.config!=4.3.0,!=4.4.0;python_version>='3.0' # Apache-2.0 oslo.context # Apache-2.0
oslo.concurrency<4.0.0;python_version<'3.0' # Apache-2.0
oslo.concurrency;python_version>='3.0' # Apache-2.0
oslo.context<3.0.0;python_version<'3.0' # Apache-2.0
oslo.context;python_version>='3.0' # Apache-2.0
oslo.db # Apache-2.0 oslo.db # Apache-2.0
oslo.i18n<4.0.0;python_version=='2.7' # Apache-2.0 oslo.i18n # Apache-2.0
oslo.i18n;python_version>='3.6' # Apache-2.0 oslo.limit # Apache-2.0
oslo.limit<1.0.0;python_version=='2.7' # Apache-2.0 oslo.log # Apache-2.0
oslo.limit;python_version>='3.0' # Apache-2.0
oslo.log<4.0.0;python_version<'3.0' # Apache-2.0
oslo.log;python_version>='3.0' # Apache-2.0
oslo.messaging!=9.0.0 # Apache-2.0 oslo.messaging!=9.0.0 # Apache-2.0
oslo.middleware # Apache-2.0 oslo.middleware # Apache-2.0
oslo.policy<3.0.0;python_version=='2.7' # Apache-2.0 oslo.policy!=3.0.0 # Apache-2.0
oslo.policy!=3.0.0;python_version>='3.6' # Apache-2.0 oslo.privsep # Apache-2.0
oslo.privsep<2.0.0;python_version=='2.7' # Apache-2.0 oslo.reports # Apache-2.0
oslo.privsep;python_version>='3.6' # Apache-2.0
oslo.reports<2.0.0;python_version<'3.0' # Apache-2.0
oslo.reports;python_version>='3.6' # Apache-2.0
oslo.rootwrap # Apache-2.0 oslo.rootwrap # Apache-2.0
# NOTE(mriedem): oslo.serialization 2.19.1 is blocked for bug 1593641 # NOTE(mriedem): oslo.serialization 2.19.1 is blocked for bug 1593641
oslo.serialization!=2.19.1,<3.0.0;python_version<'3.0' # Apache-2.0 oslo.serialization!=2.19.1 # Apache-2.0
oslo.serialization!=2.19.1;python_version>='3.0' # Apache-2.0
oslo.service!=1.28.1 # Apache-2.0 oslo.service!=1.28.1 # Apache-2.0
oslo.upgradecheck<0.4.0;python_version=='2.7' # Apache-2.0 oslo.upgradecheck # Apache-2.0
oslo.upgradecheck;python_version>='3.6' # Apache-2.0
# NOTE(lajoskatona): oslo.utils version between 3.39.1 and 3.40.1 excluded due to bug 1812922 # NOTE(lajoskatona): oslo.utils version between 3.39.1 and 3.40.1 excluded due to bug 1812922
oslo.utils!=3.39.1,!=3.40.0,!=3.40.1,<4.0.0;python_version<'3.0' # Apache-2.0 oslo.utils!=3.39.1,!=3.40.0,!=3.40.1 # Apache-2.0
oslo.utils!=3.39.1,!=3.40.0,!=3.40.1;python_version>='3.0' # Apache-2.0
oslo.vmware # Apache-2.0 oslo.vmware # Apache-2.0
oslo.versionedobjects<2.0.0;python_version=='2.7' # Apache-2.0 oslo.versionedobjects # Apache-2.0
oslo.versionedobjects;python_version>='3.6' # Apache-2.0
osprofiler # Apache-2.0 osprofiler # Apache-2.0
os-apply-config # Apache-2.0 os-apply-config # Apache-2.0
os-brick!=2.8.0 # Apache-2.0 os-brick!=2.8.0 # Apache-2.0
@ -200,16 +167,12 @@ os-net-config # Apache-2.0
os-refresh-config # Apache-2.0 os-refresh-config # Apache-2.0
os-resource-classes # Apache-2.0 os-resource-classes # Apache-2.0
os-service-types # Apache-2.0 os-service-types # Apache-2.0
os-testr<2.0.0;python_version=='2.7' # Apache-2.0 os-testr # Apache-2.0
os-testr;python_version>='3.6' # Apache-2.0
os-traits # Apache-2.0 os-traits # Apache-2.0
os-ken<1.0.0;python_version=='2.7' # Apache-2.0 os-ken # Apache-2.0
os-ken;python_version>='3.6' # Apache-2.0 os-vif!=1.8.0,!=1.12.0 # Apache-2.0
os-vif!=1.8.0,!=1.12.0,<2.0.0;python_version=='2.7' # Apache-2.0
os-vif!=1.8.0,!=1.12.0;python_version>='3.6' # Apache-2.0
ovs # Apache-2.0 ovs # Apache-2.0
os-win<5.0.0;python_version=='2.7' # Apache-2.0 os-win # Apache-2.0
os-win;python_version>='3.6' # Apache-2.0
os-xenapi # Apache-2.0 os-xenapi # Apache-2.0
paramiko # LGPLv2.1+ paramiko # LGPLv2.1+
pathlib2 # MIT pathlib2 # MIT
@ -223,8 +186,7 @@ pexpect!=3.3 # ISC License
pifpaf # Apache-2.0 pifpaf # Apache-2.0
pika # BSD pika # BSD
Pillow # PIL License Pillow # PIL License
Pint<0.10;python_version<'3.6' # BSD Pint # BSD
Pint;python_version>='3.6' # BSD
pip # MIT pip # MIT
prometheus-client # Apache-2.0 prometheus-client # Apache-2.0
protobuf # BSD License (3 clause) protobuf # BSD License (3 clause)
@ -232,8 +194,7 @@ PrettyTable<0.8 # BSD
psutil # BSD psutil # BSD
pyasn1!=0.2.3 # BSD pyasn1!=0.2.3 # BSD
pyasn1-modules # BSD pyasn1-modules # BSD
pycadf!=2.0.0,<3.0.0;python_version=='2.7' # Apache-2.0 pycadf!=2.0.0 # Apache-2.0
pycadf!=2.0.0;python_version>='3.6' # Apache-2.0
PyECLib # BSD PyECLib # BSD
pyghmi!=1.4.0,!=1.5.11 # Apache-2.0 pyghmi!=1.4.0,!=1.5.11 # Apache-2.0
pyinotify;sys_platform!='win32' and sys_platform!='darwin' and sys_platform!='sunos5' # MIT pyinotify;sys_platform!='win32' and sys_platform!='darwin' and sys_platform!='sunos5' # MIT
@ -249,7 +210,7 @@ pytest-django # BSD (3 clause)
pytest-html #MPL-2.0 pytest-html #MPL-2.0
pywbem # LGPLv2.1+ pywbem # LGPLv2.1+
pywinrm # MIT pywinrm # MIT
salt!=2019.2.1,!=2019.2.2 # Apache-2.0 salt!=2019.2.1,!=2019.2.2;python_version!='3.8' # Apache-2.0
storpool!=5.2.0,!=5.3.0 # Apache-2.0 storpool!=5.2.0,!=5.3.0 # Apache-2.0
storpool.spopenstack # Apache-2.0 storpool.spopenstack # Apache-2.0
dfs-sdk # Apache-2.0 dfs-sdk # Apache-2.0
@ -263,7 +224,6 @@ pydotplus # MIT License
crc16 # LGPLv3+ crc16 # LGPLv3+
pyzabbix # LGPL pyzabbix # LGPL
statsd # MIT statsd # MIT
weakrefmethod;python_version=='2.7' # PSF
zVMCloudConnector;sys_platform!='win32' # Apache 2.0 License zVMCloudConnector;sys_platform!='win32' # Apache 2.0 License
jaeger-client # Apache-2.0 jaeger-client # Apache-2.0
@ -280,61 +240,42 @@ pysaml2!=4.0.3,!=4.0.4,!=4.0.5,!=4.0.5rc1,!=4.1.0,!=4.2.0,!=4.3.0,!=4.4.0,!=4.6.
# as that has implications for testing in the gate. # as that has implications for testing in the gate.
aodhclient # Apache-2.0 aodhclient # Apache-2.0
gnocchiclient # Apache-2.0 gnocchiclient # Apache-2.0
tricircleclient<1.0.0;python_version=='2.7' # Apache-2.0 tricircleclient # Apache-2.0
tricircleclient;python_version>='3.6' # Apache-2.0
python-barbicanclient # Apache-2.0 python-barbicanclient # Apache-2.0
python-blazarclient<3.0.0;python_version=='2.7' # Apache-2.0 python-blazarclient # Apache-2.0
python-blazarclient;python_version>='3.6' # Apache-2.0
python-ceilometerclient # Apache-2.0 python-ceilometerclient # Apache-2.0
python-cinderclient!=4.0.0,<6.0.0;python_version=='2.7' # Apache-2.0 python-cinderclient!=4.0.0 # Apache-2.0
python-cinderclient!=4.0.0;python_version>='3.6' # Apache-2.0 python-cloudkittyclient # Apache-2.0
python-cloudkittyclient<4.0.0;python_version=='2.7' # Apache-2.0 python-congressclient<2000 # Apache-2.0
python-cloudkittyclient;python_version>='3.6' # Apache-2.0
python-congressclient<2.0.0;python_version=='2.7' # Apache-2.0
python-congressclient<2000;python_version>='3.6' # Apache-2.0
python-designateclient # Apache-2.0 python-designateclient # Apache-2.0
python-freezerclient<3.0.0;python_version=='2.7' # Apache-2.0 python-freezerclient # Apache-2.0
python-freezerclient;python_version>='3.6' # Apache-2.0 python-heatclient # Apache-2.0
python-heatclient<2.0.0;python_version=='2.7' # Apache-2.0
python-heatclient;python_version>='3.6' # Apache-2.0
python-glanceclient # Apache-2.0 python-glanceclient # Apache-2.0
python-glareclient # Apache-2.0 python-glareclient # Apache-2.0
python-ironic-inspector-client # Apache-2.0 python-ironic-inspector-client # Apache-2.0
python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0,<4.0.0;python_version=='2.7' # Apache-2.0 python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0 # Apache-2.0
python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0;python_version>='3.6' # Apache-2.0
python-karborclient # Apache-2.0 python-karborclient # Apache-2.0
python-keystoneclient!=2.1.0 # Apache-2.0 python-keystoneclient!=2.1.0 # Apache-2.0
python-magnumclient # Apache-2.0 python-magnumclient # Apache-2.0
python-masakariclient # Apache-2.0 python-masakariclient # Apache-2.0
python-manilaclient<2.0.0;python_version=='2.7' # Apache-2.0 python-manilaclient # Apache-2.0
python-manilaclient;python_version>='3.6' # Apache-2.0 python-mistralclient!=3.2.0 # Apache-2.0
python-mistralclient!=3.2.0,<4.0.0;python_version=='2.7' # Apache-2.0 python-muranoclient # Apache-2.0
python-mistralclient!=3.2.0;python_version>='3.6' # Apache-2.0 python-monascaclient # Apache-2.0
python-muranoclient<2.0.0;python_version=='2.7' # Apache-2.0
python-muranoclient;python_version>='3.6' # Apache-2.0
python-monascaclient<2.0.0;python_version=='2.7' # Apache-2.0
python-monascaclient;python_version>='3.6' # Apache-2.0
python-neutronclient # Apache-2.0 python-neutronclient # Apache-2.0
python-novaclient # Apache-2.0 python-novaclient # Apache-2.0
python-octaviaclient # Apache-2.0 python-octaviaclient # Apache-2.0
python-openstackclient # Apache-2.0 python-openstackclient # Apache-2.0
python-qinlingclient<5.0.0;python_version=='2.7' # Apache-2.0 python-qinlingclient # Apache-2.0
python-qinlingclient;python_version>='3.6' # Apache-2.0
python-rsdclient # Apache-2.0 python-rsdclient # Apache-2.0
python-saharaclient<3.0.0;python_version=='2.7' # Apache-2.0 python-saharaclient # Apache-2.0
python-saharaclient;python_version>='3.6' # Apache-2.0 python-searchlightclient #Apache-2.0
python-searchlightclient<2.0.0;python_version=='2.7' #Apache-2.0 python-senlinclient # Apache-2.0
python-searchlightclient;python_version>='3.6' #Apache-2.0 python-solumclient # Apache-2.0
python-senlinclient<2.0.0;python_version=='2.7' # Apache-2.0
python-senlinclient;python_version>='3.6' # Apache-2.0
python-solumclient<3.0.0;python_version=='2.7' # Apache-2.0
python-solumclient;python_version>='3.6' # Apache-2.0
python-swiftclient # Apache-2.0 python-swiftclient # Apache-2.0
python-tackerclient<1.0.0;python_version=='2.7' # Apache-2.0 python-tackerclient # Apache-2.0
python-tackerclient;python_version>='3.6' # Apache-2.0
python-troveclient # Apache-2.0 python-troveclient # Apache-2.0
python-vitrageclient<4.0.0;python_version=='2.7' # Apache-2.0 python-vitrageclient # Apache-2.0
python-vitrageclient;python_version>='3.6' # Apache-2.0
python-watcherclient # Apache-2.0 python-watcherclient # Apache-2.0
python-zaqarclient # Apache-2.0 python-zaqarclient # Apache-2.0
python-zunclient # Apache-2.0 python-zunclient # Apache-2.0
@ -346,9 +287,7 @@ python-dateutil # BSD
pytz # MIT pytz # MIT
pyudev # LGPLv2.1+ pyudev # LGPLv2.1+
PyYAML # MIT PyYAML # MIT
qpid-python;python_version=='2.7' # Apache-2.0 reno # Apache-2.0
reno<3.0.0;python_version<'3.0' # Apache-2.0
reno;python_version>='3.0' # Apache-2.0
requests!=2.20.0 # Apache-2.0 requests!=2.20.0 # Apache-2.0
requests-aws # BSD License (3 clause) requests-aws # BSD License (3 clause)
requests-kerberos # ISC requests-kerberos # ISC
@ -364,8 +303,7 @@ scrypt # BSD
simplejson # MIT simplejson # MIT
six # MIT six # MIT
scipy # BSD scipy # BSD
scikit-learn<=0.20.0;python_version<='3.4' # BSD scikit-learn # BSD
scikit-learn;python_version>='3.5' # BSD
setproctitle # BSD setproctitle # BSD
# NOTE(yamahata): # NOTE(yamahata):
# bug work around of sqlalchemy # bug work around of sqlalchemy
@ -389,7 +327,6 @@ tosca-parser # Apache-2.0
tripleo-common!=11.3.0 # Apache-2.0 tripleo-common!=11.3.0 # Apache-2.0
validations-libs # Apache-2.0 validations-libs # Apache-2.0
urllib3 # MIT urllib3 # MIT
unicodecsv;python_version<'3.0' # BSD
warlock<2 # Apache-2.0 warlock<2 # Apache-2.0
WebOb # MIT WebOb # MIT
websocket-client # LGPLv2+ websocket-client # LGPLv2+
@ -441,13 +378,11 @@ XStatic-tv4 # MIT
XStatic-Angular-FileUpload # MIT License XStatic-Angular-FileUpload # MIT License
yaql # Apache 2.0 License yaql # Apache 2.0 License
# NOTE(dtantsur): zeroconf dropped compatibility with Python 2 in version 0.20 # NOTE(dtantsur): zeroconf dropped compatibility with Python 2 in version 0.20
zeroconf<0.20;python_version=='2.7' # LGPL zeroconf # LGPL
zeroconf;python_version>='3.0' # LGPL
# Testing tools below, which are typically in test-requires.txt # Testing tools below, which are typically in test-requires.txt
bashate<1.0.0;python_version=='2.7' # Apache-2.0 bashate # Apache-2.0
bashate;python_version>='3.6' # Apache-2.0
couchdb # Apache-2.0 couchdb # Apache-2.0
coverage!=4.4 # Apache-2.0 coverage!=4.4 # Apache-2.0
demjson # GLGPLv3+ demjson # GLGPLv3+
@ -459,8 +394,7 @@ fixtures # Apache-2.0/BSD
freezegun # Apache-2.0 freezegun # Apache-2.0
gabbi # Apache-2.0 gabbi # Apache-2.0
kafka-python # Apache-2.0 kafka-python # Apache-2.0
keyring<19.0.0;python_version=='2.7' # MIT/PSF keyring # MIT/PSF
keyring;python_version>='3.4' # MIT/PSF
ldappool # MPL ldappool # MPL
# Do not make mock conditional on Python version: we depend on newer code than # Do not make mock conditional on Python version: we depend on newer code than
# in [most] releases of the Python std library. # in [most] releases of the Python std library.
@ -502,21 +436,15 @@ selenium # Apache-2.0
# situations as progressive releases of projects are done. # situations as progressive releases of projects are done.
# Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951 # Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951
# Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086 # Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0;python_version>='3.5' # PSF/ZPL setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0 # PSF/ZPL
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,<45.0.0;python_version<='2.7' # PSF/ZPL sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0 # BSD
sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0;python_version>='3.4' # BSD
sphinx-testing # BSD License sphinx-testing # BSD License
sphinxcontrib-actdiag<2.0.0;python_version=='2.7' # BSD sphinxcontrib-actdiag # BSD
sphinxcontrib-actdiag;python_version>='3.4' # BSD
sphinxcontrib-apidoc # BSD sphinxcontrib-apidoc # BSD
sphinxcontrib-blockdiag<2.0.0;python_version=='2.7' # BSD sphinxcontrib-blockdiag # BSD
sphinxcontrib-blockdiag;python_version>='3.4' # BSD
sphinxcontrib-httpdomain # BSD sphinxcontrib-httpdomain # BSD
sphinxcontrib-nwdiag<2.0.0;python_version=='2.7' # BSD sphinxcontrib-nwdiag # BSD
sphinxcontrib-nwdiag;python_version>='3.4' # BSD sphinxcontrib-seqdiag # BSD
sphinxcontrib-seqdiag<2.0.0;python_version=='2.7' # BSD
sphinxcontrib-seqdiag;python_version>='3.4' # BSD
sphinxcontrib-pecanwsme # Apache-2.0 sphinxcontrib-pecanwsme # Apache-2.0
sphinx-feature-classification # Apache-2.0 sphinx-feature-classification # Apache-2.0
sphinxmark # Apache-2.0 sphinxmark # Apache-2.0
@ -524,14 +452,12 @@ sphinxcontrib.datatemplates # BSD License
sphinxcontrib-programoutput # BSD license sphinxcontrib-programoutput # BSD license
sphinxcontrib-svg2pdfconverter # BSD License sphinxcontrib-svg2pdfconverter # BSD License
stestr!=2.3.0,!=3.0.0 # Apache-2.0 stestr!=2.3.0,!=3.0.0 # Apache-2.0
sushy!=1.9.0<3.0.0;python_version=='2.7' # Apache-2.0 sushy!=1.9.0 # Apache-2.0
sushy!=1.9.0;python_version>='3.6' # Apache-2.0
tabulate # MIT tabulate # MIT
testrepository # Apache-2.0/BSD testrepository # Apache-2.0/BSD
testresources # Apache-2.0/BSD testresources # Apache-2.0/BSD
testscenarios # Apache-2.0/BSD testscenarios # Apache-2.0/BSD
testtools # MIT testtools # MIT
trollius;python_version=='2.7' # Apache-2.0
ujson # BSD ujson # BSD
unittest2 # BSD unittest2 # BSD
virtualbmc # Apache-2.0 virtualbmc # Apache-2.0
@ -569,11 +495,8 @@ skydive-client # Apache-2.0
Yappi!=0.98,!=0.99 # MIT Yappi!=0.98,!=0.99 # MIT
# NOTE(yoctozepto): To avoid repeated breakage (this is a dep of deps) # NOTE(yoctozepto): To avoid repeated breakage (this is a dep of deps)
zipp<2;python_version<'3.6' # MIT zipp # MIT
zipp;python_version>='3.6' # MIT
# NOTE(prometheanfire): python3 caps, are not approved for use in OpenStack # NOTE(prometheanfire): python3 caps, are not approved for use in OpenStack
gitdb<4.0.0;python_version=='2.7' # BSD gitdb # BSD
gitdb;python_version>='3.4' # BSD gitdb2 # BSD
gitdb2<3.0.0;python_version=='2.7' # BSD
gitdb2;python_version>='3.4' # BSD

View File

@ -54,14 +54,6 @@ _setup_py_text = """# Copyright (c) 2013 Hewlett-Packard Development Company, L.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

View File

@ -16,14 +16,6 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

View File

@ -1,7 +1,7 @@
[tox] [tox]
minversion = 3.2.0 minversion = 3.2.0
skipsdist = True skipsdist = True
envlist = validate,py37,pep8,pip-install envlist = validate,py36,py38,pep8,pip-install
ignore_basepython_conflict=true ignore_basepython_conflict=true
[testenv] [testenv]
@ -18,6 +18,11 @@ basepython = python3.6
deps = -r{toxinidir}/upper-constraints.txt deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
[testenv:py38-check-uc]
basepython = python3.8
deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}

File diff suppressed because it is too large Load Diff