From bf91491fcc55b93ddfe0c1812bf690ca4b836234 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 30 Apr 2022 19:15:03 -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. [1] https://etherpad.opendev.org/p/tc-zed-ptg#L326 [2] https://governance.openstack.org/tc/resolutions/20220414-drop-lower-constraints.html#proposal Co-authored-by: zhurong Change-Id: Ieb54d8c5381d1409986df8fd9db2a5d223e10537 --- .zuul.yaml | 3 +- lower-constraints.txt | 47 ------------------- muranopkgcheck/tests/functional/test_cases.py | 2 +- requirements.txt | 4 ++ tox.ini | 6 --- 5 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index 24414e1..0bfe4ef 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,5 +2,4 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-zed-jobs diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 02b59e7..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,47 +0,0 @@ -alabaster==0.7.10 -appdirs==1.3.0 -Babel==2.3.4 -coverage==4.0 -docutils==0.11 -dulwich==0.15.0 -extras==1.0.0 -fixtures==3.0.0 -flake8==2.5.5 -hacking==0.11.0 -imagesize==0.7.1 -iso8601==0.1.11 -Jinja2==2.10 -keystoneauth1==3.4.0 -linecache2==1.0.0 -MarkupSafe==1.0 -mccabe==0.2.1 -mox3==0.20.0 -openstackdocstheme==2.2.1 -os-client-config==1.28.0 -oslo.i18n==3.15.3 -oslotest==3.2.0 -pbr==2.0.0 -pep8==1.5.7 -ply==3.10 -pyflakes==0.8.1 -Pygments==2.2.0 -python-dateutil==2.5.3 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.12 -reno==3.1.0 -requests==2.14.2 -requestsexceptions==1.2.0 -semantic-version==2.3.1 -snowballstemmer==1.2.1 -Sphinx==2.0.0 -sphinxcontrib-websupport==1.0.1 -stevedore==1.20.0 -stestr==1.0.0 -testrepository==0.0.18 -testscenarios==0.4 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -yaql==1.1.3 diff --git a/muranopkgcheck/tests/functional/test_cases.py b/muranopkgcheck/tests/functional/test_cases.py index c1cb1f3..52fe6ca 100644 --- a/muranopkgcheck/tests/functional/test_cases.py +++ b/muranopkgcheck/tests/functional/test_cases.py @@ -75,7 +75,7 @@ def load_cases(): cases = [] for cases_file in cases_files: with open(cases_file) as f: - cases.extend(list(yaml.load_all(f))) + cases.extend(list(yaml.load_all(f, yaml.SafeLoader))) return cases diff --git a/requirements.txt b/requirements.txt index c8a9c99..5237dee 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 a72ee83..0a6af1d 100644 --- a/tox.ini +++ b/tox.ini @@ -67,9 +67,3 @@ show-source = True ignore = E123,E125,W504 builtins = _ 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