Skip to content

Commit

Permalink
Fix issues related to py312 compatibility
Browse files Browse the repository at this point in the history
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
  • Loading branch information
MylesJP committed Aug 21, 2024
1 parent 66f6413 commit fda9382
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
Binary file added .coverage
Binary file not shown.
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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

Expand Down

0 comments on commit fda9382

Please sign in to comment.