From 493fa8af1618c8a76e7709da66e691a2ae1d7e1f Mon Sep 17 00:00:00 2001
From: Myles Penner <myles.penner@canonical.com>
Date: Wed, 21 Aug 2024 14:29:06 +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: I2a96eafeaf357a5ccd38d4c32c3d8cfeb050fc76
---
 .coverage             | Bin 0 -> 53248 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..562c5a2630cfaa5a5b9f25da3f0a6e87fad00cf1
GIT binary patch
literal 53248
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
B$BF;|

literal 0
HcmV?d00001

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 3e44bd9..dfa7936 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,6 +66,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 =
@@ -75,7 +82,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