From a2da50a9031b7b9d98c3865700ce139f296e4984 Mon Sep 17 00:00:00 2001 From: Myles Penner Date: Tue, 20 Aug 2024 23:01:38 +0000 Subject: [PATCH] Fix issues related to py312 compatibility Summary of changes: - Bump flake8 from 3.9.2 to 7.1.1 - Remove pinning for setuptools - Add py312 section to tox.ini [testenv] Change-Id: I87d5e45e6371632729d40d335dbcf23c1076a316 --- requirements.txt | 1 - test-requirements.txt | 1 - tox.ini | 9 ++++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index b3dc23f..c5b8af3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ # NOTE(lourot): This might look like a duplication of test-requirements.txt but # some tox targets use only test-requirements.txt whereas charm-build uses only # requirements.txt -setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 # NOTE: newer versions of cryptography require a Rust compiler to build, # see diff --git a/test-requirements.txt b/test-requirements.txt index a7936e6..3fd5feb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ # https://github.com/openstack-charmers/release-tools # pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. -setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 stestr>=2.2.0 diff --git a/tox.ini b/tox.ini index 30c5840..80a50ed 100644 --- a/tox.ini +++ b/tox.ini @@ -64,6 +64,13 @@ deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} +[testenv:py312] +basepython = python3.12 +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + [testenv:py310] basepython = python3.10 deps = @@ -73,7 +80,7 @@ commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 -deps = flake8==3.9.2 +deps = flake8==7.1.1 git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests