From b391859cf97f2ff795a7f8dbb6739c48d432f1ac Mon Sep 17 00:00:00 2001 From: Erik Olof Gunnar Andersson Date: Tue, 15 Dec 2020 18:27:54 -0800 Subject: [PATCH] Fixed lower-constraints job and updated constraints This patch brings some pip packages up to date and also introduces changes to tox to make sure that constraints are always respected. Change-Id: I7f794386b47ae9fd43db2278ee214e015d5b335b --- lower-constraints.txt | 60 +++++++++++++++++++++---------------------- requirements.txt | 30 +++++++++++----------- test-requirements.txt | 8 +++--- tox.ini | 53 ++++++++++++++++++++++++++------------ 4 files changed, 86 insertions(+), 65 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 3ad9b40e2..7fefb63f1 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,26 +1,26 @@ alembic==0.9.8 -amqp==2.2.2 +amqp==2.5.2 appdirs==1.4.3 asn1crypto==0.24.0 bandit==1.1.0 bcrypt==3.1.4 cachetools==2.0.1 certifi==2018.1.18 -cffi==1.11.5 +cffi==1.14.0 chardet==3.0.4 cliff==2.11.0 cmd2==0.8.1 contextlib2==0.5.5 -coverage==4.0 -cryptography==2.1.4 +coverage==4.5.1 +cryptography==3.2.0 debtcollector==1.19.0 -decorator==4.2.1 +decorator==4.4.1 deprecation==2.0 docker-pycreds==0.2.2 docker==2.4.2 dogpile.cache==0.6.5 enum-compat==0.0.2 -eventlet==0.18.2 +eventlet==0.26.1 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 @@ -28,22 +28,22 @@ future==0.16.0 futurist==1.6.0 gitdb2==2.0.3 GitPython==2.1.8 -greenlet==0.4.13 +greenlet==0.4.15 idna==2.6 iso8601==0.1.12 Jinja2==2.10 jmespath==0.9.3 jsonpatch==1.21 -jsonpath-rw==1.2.0 +jsonpath-rw==1.4.0 jsonpointer==2.0 jsonschema==3.2.0 -keystoneauth1==3.4.0 +keystoneauth1==3.18.0 keystonemiddleware==4.17.0 -kombu==4.1.0 +kombu==4.6.6 linecache2==1.0.0 Mako==1.0.7 -MarkupSafe==1.0 -mccabe==0.4.0 +MarkupSafe==1.1.1 +mccabe==0.6.0 microversion-parse==0.2.1 mock==2.0.0 monotonic==1.4 @@ -54,30 +54,30 @@ netaddr==0.7.19 netifaces==0.10.6 openstacksdk==0.42.0 os-client-config==1.29.0 -os-service-types==1.2.0 +os-service-types==1.7.0 oslo.cache==1.29.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.db==4.27.0 -oslo.i18n==3.15.3 +oslo.context==2.22.0 +oslo.db==6.0.0 +oslo.i18n==3.20.0 oslo.log==3.36.0 oslo.messaging==5.29.0 oslo.middleware==3.31.0 oslo.policy==1.30.0 oslo.reports==1.18.0 -oslo.serialization==2.18.0 -oslo.service==1.24.0 +oslo.serialization==2.25.0 +oslo.service==1.31.0 oslo.upgradecheck==0.1.0 -oslo.utils==3.33.0 +oslo.utils==3.37.0 oslo.versionedobjects==1.31.2 -oslotest==3.2.0 -osprofiler==1.4.0 -packaging==17.1 -paramiko==2.4.1 +oslotest==3.3.0 +osprofiler==2.3.0 +packaging==20.4 +paramiko==2.7.1 Paste==2.0.3 PasteDeploy==1.5.0 -pbr==2.0.0 +pbr==3.1.1 pika-pool==0.1.3 pika==0.10.0 ply==3.11 @@ -87,7 +87,7 @@ pycadf==2.7.0 pycparser==2.18 pycodestyle==2.5.0 pyinotify==0.9.6 -PyMySQL==0.7.6 +PyMySQL==0.8.0 PyNaCl==1.2.1 pyparsing==2.2.0 pyperclip==1.6.0 @@ -96,23 +96,23 @@ python-editor==1.0.3 python-keystoneclient==3.15.0 python-mimeparse==1.6.0 python-subunit==1.2.0 -pytz==2013.6 -PyYAML==3.12 +pytz==2015.7 +PyYAML==3.13 repoze.lru==0.7 requests==2.14.2 requestsexceptions==1.4.0 rfc3986==1.1.0 Routes==2.3.1 smmap2==2.0.3 -sqlalchemy-migrate==0.11.0 +sqlalchemy-migrate==0.13.0 SQLAlchemy==1.0.10 sqlparse==0.2.4 statsd==3.2.2 stestr==2.0.0 stevedore==1.20.0 -tempest==17.1.0 +tempest==21.0.0 Tempita==0.5.2 -tenacity==4.9.0 +tenacity==6.0.0 testresources==2.0.1 testscenarios==0.4 testtools==2.2.0 diff --git a/requirements.txt b/requirements.txt index 9ddd083b1..efa6e48b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,37 +2,37 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr!=2.1.0,>=2.0.0 # Apache-2.0 +pbr>=3.1.1 # Apache-2.0 docker>=2.4.2 # Apache-2.0 -eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT -jsonpath-rw<2.0,>=1.2.0 # Apache-2.0 +eventlet>=0.26.1 # MIT +jsonpath-rw>=1.4.0 # Apache-2.0 jsonschema>=3.2.0 # MIT -keystoneauth1>=3.4.0 # Apache-2.0 +keystoneauth1>=3.18.0 # Apache-2.0 keystonemiddleware>=4.17.0 # Apache-2.0 microversion-parse>=0.2.1 # Apache-2.0 openstacksdk>=0.42.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 -oslo.context>=2.19.2 # Apache-2.0 -oslo.db>=4.27.0 # Apache-2.0 -oslo.i18n>=3.15.3 # Apache-2.0 +oslo.context>=2.22.0 # Apache-2.0 +oslo.db>=6.0.0 # Apache-2.0 +oslo.i18n>=3.20.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 oslo.messaging>=5.29.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 -oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 +oslo.serialization>=2.25.0 # Apache-2.0 +oslo.service>=1.31.0 # Apache-2.0 oslo.upgradecheck>=0.1.0 # Apache-2.0 -oslo.utils>=3.33.0 # Apache-2.0 +oslo.utils>=3.37.0 # Apache-2.0 oslo.versionedobjects>=1.31.2 # Apache-2.0 -osprofiler>=1.4.0 # Apache-2.0 +osprofiler>=2.3.0 # Apache-2.0 PasteDeploy>=1.5.0 # MIT -pytz>=2013.6 # MIT -PyYAML>=3.12 # MIT +pytz>=2015.7 # MIT +PyYAML>=3.13 # MIT requests>=2.14.2 # Apache-2.0 Routes>=2.3.1 # MIT SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT -sqlalchemy-migrate>=0.11.0 # Apache-2.0 +sqlalchemy-migrate>=0.13.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0 -tenacity>=4.9.0 # Apache-2.0 +tenacity>=6.0.0 # Apache-2.0 WebOb>=1.7.1 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index e7855eb3e..3251ca64a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,11 +4,11 @@ # Hacking already pins down pep8, pyflakes and flake8 hacking>=3.0.1,<3.1.0 # Apache-2.0 -coverage!=4.4,>=4.0 # Apache-2.0 -oslotest>=3.2.0 # Apache-2.0 +coverage>=4.5.1 # Apache-2.0 +oslotest>=3.3.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 -PyMySQL>=0.7.6 # MIT License -tempest>=17.1.0 # Apache-2.0 +PyMySQL>=0.8.0 # MIT License +tempest>=21.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT diff --git a/tox.ini b/tox.ini index 3bb918e2d..062c8cf9f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,27 +1,44 @@ [tox] -minversion = 2.0 +minversion = 3.1.1 envlist = py37,pep8,functional +ignore_basepython_conflict = True skipsdist = True [testenv] basepython = python3 -# Note the hash seed is set to 0 until senlin can be tested with a -# random hash seed successfully. -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=senlin/tests/unit - -deps = -r{toxinidir}/test-requirements.txt - +setenv = + VIRTUAL_ENV={envdir} + LANGUAGE=C.UTF-8 + LC_ALL=C.UTF-8 + OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true} + OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true} + OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true} + OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:180} + PYTHONDONTWRITEBYTECODE=1 + PYTHONWARNINGS=default::DeprecationWarning,ignore::DeprecationWarning:distutils,ignore::DeprecationWarning:site +passenv = + http_proxy + HTTP_PROXY + https_proxy + HTTPS_PROXY + no_proxy + NO_PROXY + OS_DEBUG usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} +install_command = + pip install {opts} {packages} commands = - find . -type f -name "*.py[c|o]" -delete - stestr run {posargs} - stestr slowest - -whitelist_externals = bash - find - rm + find . -type f -name "*.py[c|o]" -delete + stestr run {posargs} + stestr slowest +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt +whitelist_externals = + bash + find + rm [testenv:debug] basepython = python3 @@ -98,6 +115,10 @@ deps = -r{toxinidir}/test-requirements.txt commands = bandit -r senlin -x tests -s B101,B104,B110,B310,B311,B506 [testenv:lower-constraints] +skip_install = True +commands = + python -m pip install --no-deps -U . + stestr run {posargs} deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt