Fix lower-constraints job

* Require hacking 4.0.0+ to fix issues with pyflakes dependencies
* Add install_command for the lower-constraints env which uses
  lower-constraints.txt instead of the upper constraints file.
* Update lower constraints and requirements to match nova

Change-Id: Icba57c52c613611311e8ef1838cd94b062b4705b
This commit is contained in:
Pierre Riteau 2021-01-05 21:35:24 +01:00
parent d399fe717b
commit 6434f21c68
4 changed files with 121 additions and 108 deletions

View File

@ -1,152 +1,168 @@
alabaster==0.7.10
alembic==0.9.8
amqp==2.2.2
amqp==2.5.0
appdirs==1.4.3
asn1crypto==0.24.0
attrs==17.4.0
automaton==1.14.0
Babel==2.5.3
bcrypt==3.1.4
bandit==1.1.0
cachetools==2.0.1
castellan==0.17.0
certifi==2018.1.18
cffi==1.11.5
chardet==3.0.4
castellan==0.16.0
cffi==1.14.0
cliff==2.11.0
cmd2==0.8.1
contextlib2==0.5.5
colorama==0.3.9
coverage==4.0
cryptography==2.1.4
cryptography==2.7
cursive==0.2.1
dataclasses==0.7
ddt==1.2.1
debtcollector==1.19.0
decorator==4.2.1
decorator==4.1.0
deprecation==2.0
docutils==0.14
dogpile.cache==0.6.5
enum-compat==0.0.2
eventlet==0.20.0
eventlet==0.26.1
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
futurist==1.6.0
greenlet==0.4.13
future==0.16.0
futurist==1.8.0
gabbi==1.35.0
gitdb2==2.0.3
GitPython==2.1.8
greenlet==0.4.15
idna==2.6
imagesize==1.0.0
iso8601==0.1.12
iso8601==0.1.11
Jinja2==2.10
jmespath==0.9.3
jsonpatch==1.21
jsonpath-rw==1.4.0
jsonpath-rw-ext==1.1.3
jsonpointer==2.0
jsonschema==2.6.0
keystoneauth1==3.4.0
keystonemiddleware==4.21.0
kombu==4.1.0
jsonschema==3.2.0
keystoneauth1==3.16.0
keystonemiddleware==4.20.0
kombu==4.6.1
linecache2==1.0.0
lxml==4.1.1
lxml==4.5.0
Mako==1.0.7
MarkupSafe==1.0
mccabe==0.2.1
microversion-parse==0.1.4
mock==2.0.0
monotonic==1.4
mox3==0.25.0
MarkupSafe==1.1.1
microversion-parse==0.2.1
mock==3.0.0
msgpack==0.5.6
msgpack-python==0.5.6
munch==2.2.0
netaddr==0.7.19
netifaces==0.10.6
networkx==1.11
mypy==0.761
netaddr==0.7.18
netifaces==0.10.4
networkx==2.1.0
nose==1.3.7
numpy==1.14.2
openstacksdk==0.12.0
os-brick==2.3.0
numpy==1.19.0
openstacksdk==0.35.0
os-brick==3.1.0
os-client-config==1.29.0
os-service-types==1.2.0
os-traits==0.5.0
os-vif==1.9.0
os-win==4.0.0
os-xenapi==0.3.1
os-resource-classes==0.4.0
os-service-types==1.7.0
os-traits==2.4.0
os-vif==1.14.0
os-win==4.2.0
os-xenapi==0.3.4
osc-lib==1.10.0
oslo.cache==1.29.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.20.0
oslo.db==4.35.0
oslo.cache==1.26.0
oslo.concurrency==3.29.0
oslo.config==6.8.0
oslo.context==2.22.0
oslo.db==4.44.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.messaging==5.36.0
oslo.middleware==3.35.0
oslo.policy==1.34.0
oslo.privsep==1.28.0
oslo.reports==1.27.0
oslo.rootwrap==5.13.0
oslo.serialization==2.25.0
oslo.service==1.30.0
oslo.utils==3.36.0
oslo.versionedobjects==1.32.0
oslotest==3.2.0
packaging==17.1
paramiko==2.4.1
Paste==2.0.3
PasteDeploy==1.5.2
pbr==3.1.1
pika-pool==0.1.3
pika==0.10.0
prettytable==0.7.2
psutil==5.4.3
pyasn1-modules==0.2.1
oslo.messaging==10.3.0
oslo.middleware==3.31.0
oslo.policy==3.4.0
oslo.privsep==1.33.2
oslo.reports==1.18.0
oslo.rootwrap==5.8.0
oslo.serialization==2.21.1
oslo.service==1.40.1
oslo.upgradecheck==0.1.1
oslo.utils==4.7.0
oslo.versionedobjects==1.35.0
oslo.vmware==2.17.0
oslotest==3.8.0
osprofiler==1.4.0
ovs==2.10.0
ovsdbapp==0.15.0
packaging==20.4
paramiko==2.7.1
Paste==2.0.2
PasteDeploy==1.5.0
pbr==2.0.0
pluggy==0.6.0
ply==3.11
prettytable==0.7.1
psutil==3.2.2
psycopg2==2.8
py==1.5.2
pyasn1==0.4.2
pyasn1-modules==0.2.1
pycadf==2.7.0
pycparser==2.18
Pygments==2.2.0
pyinotify==0.9.6
PyNaCl==1.2.1
pyroute2==0.5.4
PyJWT==1.7.0
PyMySQL==0.8.0
pyOpenSSL==17.5.0
pyparsing==2.2.0
pyperclip==1.6.0
pypowervm==1.1.11
pyroute2==0.4.21
python-barbicanclient==4.6.0
python-cinderclient==3.5.0
python-dateutil==2.7.0
pypowervm==1.1.15
pytest==3.4.2
python-barbicanclient==4.5.2
python-cinderclient==3.3.0
python-dateutil==2.5.3
python-editor==1.0.3
python-glanceclient==2.9.1
python-glanceclient==2.8.0
python-ironicclient==3.0.0
python-keystoneclient==3.15.0
python-mimeparse==1.6.0
python-neutronclient==6.7.0
python-subunit==1.2.0
python-subunit==1.4.0
pytz==2018.3
PyYAML==3.12
PyYAML==3.13
repoze.lru==0.7
requests==2.18.4
requests==2.23.0
requests-mock==1.2.0
requestsexceptions==1.4.0
retrying==1.3.3
rfc3986==1.1.0
Routes==2.4.1
rfc3986==1.2.0
Routes==2.3.1
simplejson==3.13.2
six==1.10.0
snowballstemmer==1.2.1
six==1.11.0
Sphinx==1.6.2
sphinxcontrib-httpdomain==1.3.0
sphinxcontrib-websupport==1.0.1
sqlalchemy-migrate==0.11.0
SQLAlchemy==1.2.5
smmap2==2.0.3
sortedcontainers==2.1.0
SQLAlchemy==1.2.19
sqlalchemy-migrate==0.13.0
sqlparse==0.2.4
statsd==3.2.2
stevedore==1.28.0
taskflow==3.1.0
stestr==2.0.0
stevedore==1.20.0
suds-jurko==0.6
taskflow==3.8.0
Tempita==0.5.2
tenacity==4.9.0
tenacity==6.0.0
testrepository==0.0.18
testresources==2.0.1
testscenarios==0.5.0
testresources==2.0.0
testscenarios==0.4
testtools==2.2.0
tooz==1.61.0
tooz==1.58.0
traceback2==1.4.0
unittest2==1.1.0
urllib3==1.22
vine==1.1.4
voluptuous==0.11.1
warlock==1.3.0
WebOb==1.7.4
websockify==0.8.0
warlock==1.3.1
WebOb==1.8.2
websockify==0.9.0
wrapt==1.10.11
wsgi-intercept==1.4.1
wsgi-intercept==1.7.0
zVMCloudConnector==1.3.0

View File

@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
oslo.config>=5.2.0 # Apache-2.0
oslo.config>=6.8.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
six>=1.10.0 # MIT
six>=1.11.0 # MIT

View File

@ -2,14 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=3.0.1,<3.1.0 # Apache-2.0
# remove this pyflakes from here once you bump the
# hacking to 3.2.0 or above. hacking 3.2.0 takes
# care of pyflakes version compatibilty.
pyflakes>=2.1.1
hacking>=4.0.0,<4.1.0 # Apache-2.0
nose>=1.3.7 # LGPL
mock>=2.0.0 # BSD
mock>=3.0.0 # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
sphinxcontrib-httpdomain>=1.3.0 # BSD
@ -17,6 +13,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
wsgi-intercept>=1.4.1 # MIT License
wsgi-intercept>=1.7.0 # MIT License
oslotest>=3.2.0 # Apache-2.0
oslotest>=3.8.0 # Apache-2.0

11
tox.ini
View File

@ -7,9 +7,10 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
usedevelop = True
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
install_command = {toxinidir}/tools/tox_install.sh {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv = VIRTUAL_ENV={envdir}
EVENTLET_NO_GREENDNS=yes
PYTHONHASHSEED=0
@ -32,7 +33,7 @@ builtins = _
exclude = .venv,.git,.tmp,.tox,dist,doc,*lib/python*,*egg,tools
[testenv:lower-constraints]
install_command = {toxinidir}/tools/tox_install.sh {toxinidir}/lower-constraints.txt {opts} {packages}
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt