diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 744d6a4..f27299a 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -15,10 +15,6 @@ cryptography pyrsistent<0.18.0 iso8601<1.0.0 -importlib-metadata==4.3.0 -importlib-resources<3.0.0 -setuptools<60.9.0 - git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/juju/charm-helpers.git#egg=charmhelpers 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 5dda268..0719779 100644 --- a/tox.ini +++ b/tox.ini @@ -67,9 +67,14 @@ basepython = python3.10 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} +[testenv:py312] +basepython = python3.12 +deps = -r{toxinidir}/test-requirements.txt +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