From f91e5d7656bfb782385b8ce7d27638c09680f99a Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 27 Jan 2021 17:12:44 +0000 Subject: [Train-Only] Remove lower-constraints This is not part of the PTI and is currently broken. While discussions are ongoing about removing it from every project, there's a definite lean towards doing so. Let's do just that. We can re-add in the future if necessary. While we're here, we fix some indentation in 'tox.ini'. Depends-On: https://review.opendev.org/c/openstack/devstack/+/827155/ Change-Id: Ib4784d9da96d05a54acdfbb3744af0cb053c0c6c Signed-off-by: Stephen Finucane (cherry picked from commit b04cba81ac966717472ae714b6c65c9cc7535978) (cherry picked from commit 37ce807c09fb1dd5770d84b1c8b4d4fd8a2270dc) (cherry picked from commit 64b388737983e3aa9c6f0f9dcc1eb71f78038bdc) --- .zuul.yaml | 1 - lower-constraints.txt | 37 ------------------------------------- tox.ini | 18 ++++++------------ 3 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index af9f46b..7bfd538 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -24,7 +24,6 @@ - check-requirements - lib-forward-testing - lib-forward-testing-python3 - - openstack-lower-constraints-jobs - openstack-python-jobs - openstack-python3-train-jobs - publish-openstack-docs-pti diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 1e0ab80..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,37 +0,0 @@ -alabaster==0.7.10 -Babel==2.3.4 -bandit==1.1.0 -cmd2==0.8.0 -coverage==4.0 -docutils==0.11 -extras==1.0.0 -fixtures==3.0.0 -gitdb==0.6.4 -GitPython==1.0.1 -imagesize==0.7.1 -Jinja2==2.10 -linecache2==1.0.0 -MarkupSafe==1.0 -mock==2.0.0 -pbr==2.0.0 -prettytable==0.7.2 -Pygments==2.2.0 -pyparsing==2.1.0 -pyperclip==1.5.27 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.12 -requests==2.14.2 -six==1.10.0 -smmap==0.9.0 -snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-websupport==1.0.1 -stevedore==1.20.0 -testrepository==0.0.18 -testscenarios==0.4 -testtools==2.2.0 -traceback2==1.4.0 -unicodecsv==0.8.0;python_version<'3.0' -unittest2==1.1.0 diff --git a/tox.ini b/tox.ini index bf227fa..10538cf 100644 --- a/tox.ini +++ b/tox.ini @@ -4,12 +4,12 @@ envlist = py27,py37,pep8 [testenv] setenv = - VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=cliff - OS_STDOUT_CAPTURE=1 - OS_STDERR_CAPTURE=1 - OS_TEST_TIMEOUT=60 + VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=cliff + OS_STDOUT_CAPTURE=1 + OS_STDERR_CAPTURE=1 + OS_TEST_TIMEOUT=60 distribute = False install_command = pip install {opts} {packages} commands = @@ -54,9 +54,3 @@ basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html doc/source doc/build/html -[testenv:lower-constraints] -basepython = python3 -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt -- cgit v1.2.1