diff options
| -rw-r--r-- | pbr/tests/test_integration.py | 33 | ||||
| -rw-r--r-- | tools/integration.sh | 4 | ||||
| -rw-r--r-- | tox.ini | 21 |
3 files changed, 34 insertions, 24 deletions
diff --git a/pbr/tests/test_integration.py b/pbr/tests/test_integration.py index 25473b0..8b5e76a 100644 --- a/pbr/tests/test_integration.py +++ b/pbr/tests/test_integration.py @@ -210,20 +210,24 @@ class TestMarkersPip(base.BaseTestCase): scenarios = [ ('pip-latest', {'modules': ['pip']}), - ('setuptools-Bionic', { - 'modules': ['pip==9.0.1', 'setuptools==39.0.1']}), - ('setuptools-Stretch', { - 'modules': ['pip==9.0.1', 'setuptools==33.1.1']}), - ('setuptools-EL8', {'modules': ['pip==9.0.3', 'setuptools==39.2.0']}), - ('setuptools-Buster', { - 'modules': ['pip==18.1', 'setuptools==40.8.0']}), - ('setuptools-Focal', { - 'modules': ['pip==20.0.2', 'setuptools==45.2.0']}), + ( + 'setuptools-Bullseye', + {'modules': ['pip==20.3.4', 'setuptools==52.0.0']}, + ), + ( + 'setuptools-Focal', + {'modules': ['pip==20.0.2', 'setuptools==45.2.0']}, + ), + ( + 'setuptools-Jammy', + {'modules': ['pip==22.0.2', 'setuptools==59.6.0']}, + ), ] @testtools.skipUnless( os.environ.get('PBR_INTEGRATION', None) == '1', - 'integration tests not enabled') + 'integration tests not enabled', + ) def test_pip_versions(self): pkgs = { 'test_markers': @@ -265,16 +269,15 @@ class TestLTSSupport(base.BaseTestCase): # These versions come from the versions installed from the 'virtualenv' # command from the 'python-virtualenv' package. scenarios = [ - ('Bionic', {'modules': ['pip==9.0.1', 'setuptools==39.0.1']}), - ('Stretch', {'modules': ['pip==9.0.1', 'setuptools==33.1.1']}), - ('EL8', {'modules': ['pip==9.0.3', 'setuptools==39.2.0']}), - ('Buster', {'modules': ['pip==18.1', 'setuptools==40.8.0']}), + ('Bullseye', {'modules': ['pip==20.3.4', 'setuptools==52.0.0']}), ('Focal', {'modules': ['pip==20.0.2', 'setuptools==45.2.0']}), + ('Jammy', {'modules': ['pip==22.0.2', 'setuptools==59.6.0']}), ] @testtools.skipUnless( os.environ.get('PBR_INTEGRATION', None) == '1', - 'integration tests not enabled') + 'integration tests not enabled', + ) def test_lts_venv_default_versions(self): venv = self.useFixture( test_packaging.Venv('setuptools', modules=self.modules)) diff --git a/tools/integration.sh b/tools/integration.sh index 13480f9..0e99b43 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -38,9 +38,9 @@ sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysql # by apt-cache showsrc <PKG> # Numpy -sudo apt-get install -y --force-yes cython debhelper gfortran libblas-dev liblapack-dev python-all-dbg python-all-dev python-nose python-tz python3-all-dbg python3-all-dev python3-nose python3-tz +sudo apt-get install -y --force-yes cython3 debhelper gfortran libblas-dev liblapack-dev python3-all-dbg python3-all-dev python3-nose python3-tz #pyyaml -sudo apt-get install -y --force-yes debhelper python-all-dev python-all-dbg python3-all-dev python3-all-dbg libyaml-dev cython cython-dbg quilt +sudo apt-get install -y --force-yes debhelper python3-all-dev python3-all-dbg libyaml-dev cython3 cython3-dbg quilt # And use ccache explitly export PATH=/usr/lib/ccache:$PATH @@ -1,12 +1,17 @@ [tox] minversion = 3.18.0 -envlist = pep8,py27,py37,docs -ignore_basepython_conflict = True +envlist = pep8,py3,docs [testenv] -usedevelop = True -basepython = python3 -passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS +usedevelop = true +passenv = + PBR_INTEGRATION + PIPFLAGS + PIPVERSION + PBRVERSION + REPODIR + WHEELHOUSE + PROJECTS # TODO(fungi): drop distutils override once logging improves in Setuptools # https://github.com/pypa/setuptools/issues/3038 setenv = @@ -24,7 +29,8 @@ commands = stestr run --suppress-attachments {posargs} commands = pre-commit run -a [testenv:docs] -allowlist_externals = rm +allowlist_externals = + rm deps = -r{toxinidir}/doc/requirements.txt commands = @@ -33,7 +39,8 @@ commands = sphinx-build -W -b html doc/source doc/build/html {posargs} [testenv:releasenotes] -allowlist_externals = rm +allowlist_externals = + rm deps = {[testenv:docs]deps} commands = rm -rf releasenotes/build |