Pin tox to < 4.0.0
Tox 4.0.0 was recently released and it has several breaking changes. We pin to < 4.0.0 here. We are planning to move forward only on the master charm branches. Tox is also pinned to < 4.0.0 for stable branches in upstream openstack-zuul-jobs as well as in zosci-config. However, the requires= section in the charm's tox.ini file ends up installing tox>4, wiping out the zuul-pinned tox<4 that was already installed installed. This patch fixes that. Additional changes include: - Add bindep.txt changes from origin/master by hand. - Switch charm-tools to 2.8.4 to remove ruamel requirement that doesn't work on Python 3.10. Related-Bug: #2002788 Change-Id: If5e5beda90a918e8ff48f1d47fc91d90d79d27fe
This commit is contained in:
parent
be2f3d1f60
commit
0a3bb225c1
4
bindep.txt
Normal file
4
bindep.txt
Normal file
@ -0,0 +1,4 @@
|
||||
libffi-dev [platform:dpkg]
|
||||
libpq-dev [platform:dpkg]
|
||||
libxml2-dev [platform:dpkg]
|
||||
libxslt1-dev [platform:dpkg]
|
@ -10,7 +10,7 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
|
||||
|
||||
# Build requirements
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
charm-tools==2.8.3
|
||||
charm-tools==2.8.4
|
||||
|
||||
simplejson
|
||||
|
||||
|
3
tox.ini
3
tox.ini
@ -23,6 +23,7 @@ requires =
|
||||
pip < 20.3
|
||||
virtualenv < 20.0
|
||||
setuptools<50.0.0
|
||||
tox < 4.0.0
|
||||
|
||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||
minversion = 3.18.0
|
||||
@ -81,7 +82,7 @@ commands = stestr run --slowest {posargs}
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = flake8==3.9.2
|
||||
charm-tools==2.8.3
|
||||
charm-tools==2.8.4
|
||||
commands = flake8 {posargs} src unit_tests
|
||||
|
||||
[testenv:func-target]
|
||||
|
Loading…
Reference in New Issue
Block a user