From fda938294e9b92a47499f8a362d6b3d344c8b098 Mon Sep 17 00:00:00 2001 From: Myles Penner Date: Wed, 21 Aug 2024 14:37:36 +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: Ie53bf379670459ede692e77380707b3ddcaf697b --- .coverage | Bin 0 -> 61440 bytes requirements.txt | 1 - test-requirements.txt | 1 - tox.ini | 9 ++++++++- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .coverage diff --git a/.coverage b/.coverage new file mode 100644 index 0000000000000000000000000000000000000000..d6c91e86fd1c2ddd1d1f678164141341c080541c GIT binary patch literal 61440 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.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