From e2f37f5e635897142faa7fedca151d429e64b8b6 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 28 Apr 2020 10:55:25 +0200 Subject: [PATCH] Remove install_cmd,lower-constraints Move constraints into deps, remove install_cmd. The default install_cmd is just fine to use. Increase constraints since they are now finally tested, see http://lists.openstack.org/pipermail/openstack-discuss/2020-April/014237.html showed that they are broken. The lower-constraints job is optional, remove it. Change-Id: Ieda45ef624e0cd4e60216b740cc04aff0783e863 --- .zuul.yaml | 1 - lower-constraints.txt | 138 ------------------------------------------ requirements.txt | 4 +- test-requirements.txt | 2 +- tox.ini | 25 ++++---- 5 files changed, 16 insertions(+), 154 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index cc14324c8..574b86c08 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -95,7 +95,6 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-lower-constraints-jobs - openstack-python3-ussuri-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 27b789032..000000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,138 +0,0 @@ -alabaster==0.7.10 -alembic==0.8.10 -amqp==2.2.2 -appdirs==1.4.3 -asn1crypto==0.24.0 -Babel==2.3.4 -bandit==1.1.0 -bcrypt==3.1.4 -beautifulsoup4==4.6.0 -cachetools==2.0.1 -castellan==1.2.1 -certifi==2018.1.18 -cffi==1.7.0 -chardet==3.0.4 -cliff==2.11.0 -cmd2==0.8.1 -contextlib2==0.5.5 -coverage==4.0 -cryptography==2.1 -ddt==1.0.1 -debtcollector==1.19.0 -decorator==4.2.1 -docutils==0.14 -dogpile.cache==0.6.5 -dogtag-pki==10.3.5.1 -dulwich==0.19.0 -doc8==0.6.0 -enum-compat==0.0.2 -enum34==1.1.6 -eventlet==0.18.2 -extras==1.0.0 -fasteners==0.14.1 -fixtures==3.0.0 -flake8==2.5.5 -future==0.16.0 -futurist==1.6.0 -gitdb2==2.0.3 -GitPython==2.1.8 -greenlet==0.4.13 -hacking==0.12.0 -idna==2.6 -imagesize==1.0.0 -iso8601==0.1.12 -Jinja2==2.10 -jsonschema==2.6.0 -keystoneauth1==3.4.0 -keystonemiddleware==4.17.0 -kombu==4.1.0 -ldap3==1.0.2 -linecache2==1.0.0 -logutils==0.3.5 -Mako==1.0.7 -MarkupSafe==1.0 -mccabe==0.2.1 -monotonic==1.4 -mox3==0.25.0 -msgpack==0.5.6 -netaddr==0.7.19 -netifaces==0.10.6 -openstackdocstheme==1.18.1 -os-api-ref==1.4.0 -os-client-config==1.29.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.log==3.36.0 -oslo.messaging==5.29.0 -oslo.middleware==3.31.0 -oslo.policy==1.30.0 -oslo.serialization==2.18.0 -oslo.service==1.24.0 -oslo.upgradecheck==0.1.1 -oslo.utils==3.33.0 -oslo.versionedobjects==1.31.2 -oslotest==3.2.0 -paramiko==2.4.1 -Paste==2.0.2 -PasteDeploy==1.5.0 -pbr==2.0.0 -pecan==1.0.0 -pep8==1.5.7 -pika-pool==0.1.3 -pika==0.10.0 -prettytable==0.7.2 -pyasn1==0.4.2 -pycadf==2.7.0 -pycparser==2.18 -pyflakes==0.8.1 -Pygments==2.2.0 -pyinotify==0.9.6 -PyKMIP==0.7.0 -PyNaCl==1.2.1 -pyOpenSSL==17.1.0 -pyparsing==2.2.0 -pyperclip==1.6.0 -python-dateutil==2.7.0 -python-editor==1.0.3 -python-keystoneclient==3.8.0 -python-mimeparse==1.6.0 -python-subunit==1.2.0 -pytz==2018.3 -PyYAML==3.12 -reno==2.5.0 -repoze.lru==0.7 -requests==2.14.2 -requestsexceptions==1.4.0 -rfc3986==1.1.0 -Routes==2.4.1 -six==1.10.0 -smmap2==2.0.3 -snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-svg2pdfconverter==0.1.0 -sphinxcontrib-websupport==1.0.1 -sqlalchemy-migrate==0.11.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 -Tempita==0.5.2 -tenacity==4.9.0 -testresources==2.0.1 -testscenarios==0.5.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -urllib3==1.22 -vine==1.1.4 -voluptuous==0.11.1 -waitress==1.1.0 -WebOb==1.7.1 -WebTest==2.0.27 -wrapt==1.10.11 diff --git a/requirements.txt b/requirements.txt index 40bd69d7b..0098dc0a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,14 +6,14 @@ cffi>=1.7.0 # MIT cryptography>=2.1 # BSD/Apache-2.0 eventlet>=0.18.2,!=0.18.3,!=0.20.1 # MIT jsonschema>=2.6.0 # MIT -oslo.config>=5.2.0 # Apache-2.0 +oslo.config>=6.4.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.messaging>=5.29.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 -oslo.policy>=1.30.0 # Apache-2.0 +oslo.policy>=1.33.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.upgradecheck>=0.1.1 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index b25df2552..7d91896b8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,7 +12,7 @@ pykmip>=0.7.0 # Apache 2.0 License stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT fixtures>=3.0.0 # Apache-2.0/BSD -requests>=2.14.2 # Apache-2.0 +requests>=2.18.0 # Apache-2.0 WebTest>=2.0.27 # MIT python-keystoneclient>=3.8.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 94f24a4fa..f6891a848 100644 --- a/tox.ini +++ b/tox.ini @@ -9,9 +9,10 @@ basepython = python3 setenv = PYTHON=coverage run --source barbican --parallel-mode usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -U {opts} {packages} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = oslo-config-generator --config-file etc/oslo-config-generator/barbican.conf --output-file etc/barbican/barbican.conf @@ -75,7 +76,9 @@ commands = # This environment is called from CI scripts to test and publish # the main docs to https://docs.openstack.org/barbican description = Build main documentation -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands= rm -rf doc/build doc/build/doctrees sphinx-build -W -b html doc/source doc/build/html @@ -110,7 +113,9 @@ whitelist_externals = rm # This tox env is purely to make local test development easier # Note: This requires local running instances of Barbican and Keystone # TODO(dmend): remove --serial and uncomment coverage commands -deps = -r{toxinidir}/test-requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/test-requirements.txt setenv = OS_TEST_PATH={toxinidir}/functionaltests commands = @@ -126,7 +131,9 @@ passenv = KMIP_PLUGIN_ENABLED [testenv:cmd] # This tox env is purely to make local test development easier # Note: This requires local running instances of Barbican and Keystone -deps = -r{toxinidir}/test-requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/test-requirements.txt setenv = OS_TEST_PATH={toxinidir}/barbican/cmd/functionaltests commands = @@ -163,9 +170,3 @@ commands = oslopolicy-sample-generator --config-file=etc/oslo-config-generator/p [hacking] local-check-factory = barbican.hacking.checks.factory - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt