diff options
| author | Tim Burke <tim.burke@gmail.com> | 2023-04-26 10:54:01 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2023-04-26 11:40:03 -0700 |
| commit | 0518c60235abc2405f532f80a9e1b998955957a9 (patch) | |
| tree | 6a816f898e023a2fbb8127e44ad3f69cdf72158c | |
| parent | 0a970d073684c06a9382d673c03d476d4b2c773b (diff) | |
| download | swift-0518c60235abc2405f532f80a9e1b998955957a9.tar.gz | |
CI: Use [tox]requires to pin virtualenv
Using an antiquated distro to keep us on an EOL'ed version of python
that *just so happens* to have had support dropped for it around the
same time virtualenv removed the ability to create py27 environments
doesn't seem like the right way to address the problem.
Make sure we also include the tox<4 pin that we're using project-wide
so we don't get some nonsense about "Multiple top-level packages
discovered in a flat-layout".
Related-Change: https://review.opendev.org/c/openstack/swift/+/881035
Change-Id: I32a161e555179ca34d306ac37e4097611853e36b
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | tox.ini | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index b0bf91be7..16e5fd2e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -527,7 +527,7 @@ name: swift-tox-lower-constraints parent: openstack-tox-lower-constraints # This seems defensible for a l-c job - nodeset: ubuntu-bionic + nodeset: ubuntu-jammy vars: bindep_profile: test py27 python_version: 2.7 @@ -1,6 +1,11 @@ [tox] envlist = py37,py27,pep8 minversion = 3.18.0 +requires = + # required to support py27/py36 envs + virtualenv<20.22 + # project-wide requirement; see .zuul.yaml + tox<4 [pytest] addopts = --verbose |