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]
- Minor whitespace linting fix

Change-Id: Iaef27965be8c1e92eeaa16f5b465da8624f54a7a

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

src/lib/charm/openstack/cinder_backup_swift_proxy.py

@@ -7,7 +7,7 @@ from charmhelpers.core.host import install_ca_cert
 from base64 import b64decode
 
 from charmhelpers.contrib.openstack.context import OSContextGenerator
-from charmhelpers.contrib.openstack.utils import get_os_codename_package,\
+from charmhelpers.contrib.openstack.utils import get_os_codename_package, \
     CompareOpenStackReleases
 from charms_openstack.charm import OpenStackCharm
 

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
 

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