From 88d9268b5f3663c8dfea0bd267ed14c5b9348f3b Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sun, 8 Jan 2023 14:14:40 -0600
Subject: [stable-only] Pin tox <4

We pinned tox<4 for stable branches in common jobs
and in devstack playbook but that was not enough for
python client functional jobs where tox is upgraded to
latest by pip.

- https://lists.openstack.org/pipermail/openstack-discuss/2023-January/031678.html

This commit adds tox<4 pin explicitly in tox.ini

Extra change in this backport:

lower-constraint job started failing. As we are no more required to test the
lower-constraints, removing the testing to unblock the gate.

Change-Id: I442568a5f5900e593feb2b5527109e0aa79e5aa7
(cherry picked from commit 7c3f3bc615cb91cd0106f91b0452bf7968ff3598)
(cherry picked from commit 79c21ab698055504567c45a31e18c7cc1eedf50b)
---
 .zuul.yaml            |  1 -
 lower-constraints.txt | 99 ---------------------------------------------------
 tox.ini               |  7 +---
 3 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 lower-constraints.txt

diff --git a/.zuul.yaml b/.zuul.yaml
index 8072db0b..922332b8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,7 +19,6 @@
       - check-requirements
       - lib-forward-testing-python3
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
       - openstack-python3-xena-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 117b697c..00000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-amqp==2.1.1
-appdirs==1.3.0
-asn1crypto==0.23.0
-cachetools==2.0.0
-cffi==1.14.0
-cliff==2.8.0
-cmd2==0.8.0
-contextlib2==0.4.0
-coverage==4.0
-cryptography==2.1
-ddt==1.0.1
-debtcollector==1.2.0
-decorator==3.4.0
-deprecation==1.0
-dogpile.cache==0.6.2
-eventlet==0.18.2
-extras==1.0.0
-fasteners==0.7.0
-fixtures==3.0.0
-future==0.16.0
-futurist==1.2.0
-gitdb==0.6.4
-GitPython==1.0.1
-greenlet==0.4.15
-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.5.0
-kombu==4.0.0
-linecache2==1.0.0
-MarkupSafe==1.1.1
-monotonic==0.6
-msgpack-python==0.4.0
-munch==2.1.0
-netaddr==0.7.18
-netifaces==0.10.4
-openstacksdk==0.11.2
-os-client-config==1.28.0
-os-service-types==1.2.0
-osc-lib==1.8.0
-oslo.concurrency==3.25.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
-osprofiler==1.4.0
-paramiko==2.0.0
-Paste==2.0.2
-PasteDeploy==1.5.0
-pbr==2.0.0
-pika==0.10.0
-pika-pool==0.1.3
-positional==1.2.1
-prettytable==0.7.2
-pyasn1==0.1.8
-pycparser==2.18
-pyinotify==0.9.6
-pyOpenSSL==17.1.0
-pyparsing==2.1.0
-pyperclip==1.5.27
-python-cinderclient==3.3.0
-python-dateutil==2.5.3
-python-glanceclient==2.8.0
-python-keystoneclient==3.8.0
-python-mimeparse==1.6.0
-python-neutronclient==6.7.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.13
-repoze.lru==0.7
-requests==2.14.2
-requests-mock==1.2.0
-requestsexceptions==1.2.0
-rfc3986==0.3.1
-Routes==2.3.1
-smmap==0.9.0
-statsd==3.2.1
-stevedore==2.0.1
-tempest==17.1.0
-tenacity==3.2.1
-stestr==2.0.0
-testscenarios==0.4
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-urllib3==1.21.1
-vine==1.1.4
-warlock==1.2.0
-WebOb==1.7.1
-wrapt==1.7.0
diff --git a/tox.ini b/tox.ini
index c62d61b5..f3ef8d6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist = py3,pep8,docs
 minversion = 3.18.0
+requires = tox<4
 skipsdist = true
 ignore_basepython_conflict = true
 
@@ -101,9 +102,3 @@ import_exceptions = novaclient.i18n
 # separately, outside of the requirements files.
 deps = bindep
 commands = bindep test
-
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-- 
cgit v1.2.1