From 8e3a391fd63c0a319071fc55996faab3e6699a0f Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 30 Apr 2022 15:31:17 -0500 Subject: [PATCH] Drop lower-constraints.txt and its testing As discussed in TC PTG[1] and TC resolution[2], we are dropping the lower-constraints.txt file and its testing. We will keep lower bounds in the requirements.txt file but with a note that these are not tested lower bounds and we try our best to keep them updated. This patch also fixes a broken test by updating the maximum payload size to match the current maximum in Barbican. [3] This patch also skips an additional broken test. It will be fixed in a separate patch. [1] https://etherpad.opendev.org/p/tc-zed-ptg#L326 [2] https://governance.openstack.org/tc/resolutions/20220414-drop-lower-constraints.html#proposal [3] https://opendev.org/openstack/barbican/src/branch/stable/yoga/barbican/common/config.py#L33 Change-Id: Id192b8eef2c2518b8a89f200727bd03c47dbd07e --- .zuul.yaml | 1 - barbicanclient/tests/test_barbican.py | 2 + functionaltests/common/config.py | 2 +- lower-constraints.txt | 74 --------------------------- requirements.txt | 4 ++ tox.ini | 6 --- 6 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index d61d8168..e8d5e09b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -13,7 +13,6 @@ - project: templates: - check-requirements - - openstack-lower-constraints-jobs - openstack-python3-wallaby-jobs - openstackclient-plugin-jobs - publish-openstack-docs-pti diff --git a/barbicanclient/tests/test_barbican.py b/barbicanclient/tests/test_barbican.py index dab036ea..22dfca44 100644 --- a/barbicanclient/tests/test_barbican.py +++ b/barbicanclient/tests/test_barbican.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import six +from testtools import testcase from barbicanclient import barbican as barb from barbicanclient.barbican import Barbican @@ -48,6 +49,7 @@ class WhenTestingBarbicanCLI(test_client.BaseEntityResource): self.assertIsNotNone(client) return client + @testcase.skip("https://storyboard.openstack.org/#!/story/2010022") def test_should_show_usage_with_help_flag(self): e = self.assertRaises(SystemExit, self.barbican.run, ['-h']) self.assertEqual(0, e.code) diff --git a/functionaltests/common/config.py b/functionaltests/common/config.py index dbe4f293..f5570112 100644 --- a/functionaltests/common/config.py +++ b/functionaltests/common/config.py @@ -48,7 +48,7 @@ def setup_config(config_file=''): cfg.StrOpt('project_name', default='admin'), cfg.StrOpt('project_id', default='admin'), cfg.StrOpt('project_domain_name', default='Default'), - cfg.IntOpt('max_payload_size', default=10000) + cfg.IntOpt('max_payload_size', default=20000) ] TEST_CONF.register_group(keymanager_group) TEST_CONF.register_opts(keymanager_options, group=keymanager_group) diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index e4d01ebd..00000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,74 +0,0 @@ -appdirs==1.3.0 -asn1crypto==0.23.0 -Babel==2.3.4 -cffi==1.14.0 -cliff==2.8.0 -cmd2==0.8.0 -coverage==4.1 -cryptography==2.7 -debtcollector==1.2.0 -decorator==3.4.0 -deprecation==1.0 -dogpile.cache==0.6.2 -extras==1.0.0 -fixtures==3.0.0 -flake8==2.5.5 -hacking==0.12.0 -idna==2.6 -iso8601==0.1.11 -jmespath==0.9.0 -jsonpatch==1.16 -jsonpointer==1.13 -jsonschema==2.6.0 -keystoneauth1==3.4.0 -linecache2==1.0.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 -nose==1.3.7 -openstacksdk==0.11.2 -os-client-config==1.28.0 -os-service-types==1.2.0 -osc-lib==1.8.0 -oslo.config==5.2.0 -oslo.i18n==3.15.3 -oslo.serialization==2.18.0 -oslo.utils==3.33.0 -oslotest==3.2.0 -pbr==2.0.0 -pep8==1.5.7 -positional==1.2.1 -prettytable==0.7.2 -pycparser==2.18 -pyflakes==0.8.1 -pyOpenSSL==17.1.0 -pyparsing==2.1.0 -pyperclip==1.5.27 -python-cinderclient==3.3.0 -python-glanceclient==2.8.0 -python-keystoneclient==3.8.0 -python-mimeparse==1.6.0 -python-novaclient==9.1.0 -python-openstackclient==3.12.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.13 -requests==2.14.2 -requests-mock==1.2.0 -requestsexceptions==1.2.0 -rfc3986==0.3.1 -simplejson==3.5.1 -six==1.10.0 -sphinxcontrib-svg2pdfconverter==0.1.0 -stevedore==1.20.0 -stestr==2.0.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -warlock==1.2.0 -wrapt==1.7.0 diff --git a/requirements.txt b/requirements.txt index aab6108e..1ce91a6b 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 9b40a9ee..f5284de7 100644 --- a/tox.ini +++ b/tox.ini @@ -66,9 +66,3 @@ commands = nosetests {toxinidir}/functionaltests/{posargs} -v ignore = H202,W504 show-source = True exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt