From db92b96407ac18a611b3d79d34080acaa9c55b8f Mon Sep 17 00:00:00 2001 From: likui Date: Wed, 11 May 2022 17:36:29 +0800 Subject: [PATCH] Stop testing lower-constraints [1] http://lists.openstack.org/pipermail/openstack-discuss/2020-October/018445.html Conflicts: .zuul.yaml lower-constraints.txt Changes: bindep.txt NOTE(stephenfin): Conflicts are due to the changed job template (ussuri vs victoria) and slightly different lower constraints between branches. We also need to remove 'libffi6' from 'bindep.txt' since Focal doesn't have this. This was done in the Victoria cycle as part of change Iab3634039845adb649c7fd69d1812b405a61433c but we must squash it in here. Change-Id: I45e9a81d451c64cdd51f9b606d94161742bacdb7 (cherry picked from commit c677192d51ac80922f990c8a96b49e9dcc9325d2) (cherry picked from commit cde8db3d619ff94369cdabeebb42d3ecc2027651) (cherry picked from commit 40f56c653cc4eabf9edc05b5c5785e818295b013) (cherry picked from commit 84af7608ef931bd21bac7bf29247feda13275313) --- .zuul.yaml | 1 - bindep.txt | 1 - lower-constraints.txt | 145 ------------------------------------------ requirements.txt | 4 ++ tox.ini | 6 -- 5 files changed, 4 insertions(+), 153 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index 4279618ad4..f1f4c9eeef 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -225,7 +225,6 @@ - openstackclient-plugin-jobs - osc-tox-unit-tips - openstack-cover-jobs - - openstack-lower-constraints-jobs - openstack-python3-ussuri-jobs - publish-openstack-docs-pti - check-requirements diff --git a/bindep.txt b/bindep.txt index cf94d2a8cb..4c90a026fe 100644 --- a/bindep.txt +++ b/bindep.txt @@ -5,7 +5,6 @@ gcc [compile test] libc6-dev [compile test platform:dpkg] libffi-devel [platform:rpm] libffi-dev [compile test platform:dpkg] -libffi6 [platform:dpkg] libssl-dev [compile test platform:dpkg] python3-dev [compile test platform:dpkg] python3-devel [compile test platform:rpm] diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 927faaea42..0000000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,145 +0,0 @@ -amqp==2.1.1 -aodhclient==0.9.0 -appdirs==1.3.0 -asn1crypto==0.23.0 -Babel==2.3.4 -bandit==1.1.0 -cachetools==2.0.0 -cffi==1.7.0 -cliff==2.8.0 -cmd2==0.8.0 -contextlib2==0.4.0 -coverage==4.0 -cryptography==2.1 -debtcollector==1.2.0 -decorator==3.4.0 -deprecation==1.0 -docker-pycreds==0.2.1 -docker==2.4.2 -dogpile.cache==0.6.2 -eventlet==0.18.2 -extras==1.0.0 -fasteners==0.7.0 -fixtures==3.0.0 -flake8-import-order==0.13 -flake8==2.6.2 -future==0.16.0 -futurist==1.2.0 -gitdb==0.6.4 -GitPython==1.0.1 -gnocchiclient==3.3.1 -greenlet==0.4.10 -hacking==2.0.0 -httplib2==0.9.1 -idna==2.6 -iso8601==0.1.11 -Jinja2==2.10 -jmespath==0.9.0 -jsonpatch==1.16 -jsonpointer==1.13 -jsonschema==2.6.0 -keystoneauth1==3.16.0 -kombu==4.0.0 -linecache2==1.0.0 -MarkupSafe==1.1.0 -mccabe==0.2.1 -mock==2.0.0 -monotonic==0.6 -mox3==0.20.0 -msgpack-python==0.4.0 -munch==2.1.0 -netaddr==0.7.18 -netifaces==0.10.4 -openstacksdk==0.36.0 -os-client-config==1.28.0 -os-service-types==1.7.0 -os-testr==1.0.0 -osc-lib==2.0.0 -osc-placement==1.7.0 -oslo.concurrency==3.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.i18n==3.15.3 -oslo.log==3.36.0 -oslo.messaging==5.29.0 -oslo.middleware==3.31.0 -oslo.serialization==2.18.0 -oslo.service==1.24.0 -oslo.utils==3.33.0 -oslotest==3.2.0 -osprofiler==1.4.0 -paramiko==2.0.0 -Paste==2.0.2 -PasteDeploy==1.5.0 -pbr==2.0.0 -pika-pool==0.1.3 -pika==0.10.0 -ply==3.10 -positional==1.2.1 -prettytable==0.7.2 -pyasn1==0.1.8 -pycodestyle==2.0.0 -pycparser==2.18 -pyflakes==0.8.1 -pyinotify==0.9.6 -pyOpenSSL==17.1.0 -pyparsing==2.1.0 -pyperclip==1.5.27 -python-barbicanclient==4.5.2 -python-cinderclient==3.3.0 -python-congressclient==1.9.0 -python-dateutil==2.5.3 -python-designateclient==2.7.0 -python-glanceclient==2.8.0 -python-heatclient==1.10.0 -python-ironic-inspector-client==1.5.0 -python-ironicclient==2.3.0 -python-karborclient==0.6.0 -python-keystoneclient==3.22.0 -python-mimeparse==1.6.0 -python-mistralclient==3.1.0 -python-muranoclient==0.8.2 -python-neutronclient==6.7.0 -python-novaclient==15.1.0 -python-octaviaclient==1.11.0 -python-rsdclient==1.0.1 -python-saharaclient==1.4.0 -python-searchlightclient==1.0.0 -python-senlinclient==1.1.0 -python-subunit==1.0.0 -python-swiftclient==3.2.0 -python-troveclient==3.1.0 -python-watcherclient==2.5.0 -python-zaqarclient==1.0.0 -python-zunclient==3.6.0 -pytz==2013.6 -PyYAML==3.13 -repoze.lru==0.7 -requests-mock==1.2.0 -requests==2.14.2 -requestsexceptions==1.2.0 -rfc3986==0.3.1 -Routes==2.3.1 -rsd-lib==0.1.0 -simplejson==3.5.1 -six==1.10.0 -smmap==0.9.0 -statsd==3.2.1 -stestr==1.0.0 -stevedore==1.20.0 -sushy==0.1.0 -tempest==17.1.0 -tenacity==3.2.1 -testrepository==0.0.18 -testtools==2.2.0 -traceback2==1.4.0 -ujson==1.35 -unittest2==1.1.0 -urllib3==1.21.1 -validictory==1.1.1 -vine==1.1.4 -warlock==1.2.0 -WebOb==1.7.1 -websocket-client==0.44.0 -wrapt==1.7.0 -yaql==1.1.3 diff --git a/requirements.txt b/requirements.txt index b17b6a5593..e6833dcc52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,7 @@ +# Requirements lower bounds listed here are our best effort to keep them up to +# date but we do not test them so no guarantee of having them all correct. If +# you find any incorrect lower bounds, let us know or propose a fix. + # 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. diff --git a/tox.ini b/tox.ini index ace3506a04..5c666cc4d2 100644 --- a/tox.ini +++ b/tox.ini @@ -141,9 +141,3 @@ exclude = .git,.tox,dist,doc,*lib/python*,*egg,build,tools ignore = W504 import-order-style = pep8 application_import_names = openstackclient - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt