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. Related-Bug: #2002788 Change-Id: Ib1904db255750aba221f95dd38422ecc9a209574
This commit is contained in:
parent
6aed1d4966
commit
cd623f8548
|
@ -1,4 +1,7 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-jobs
|
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
check:
|
||||||
|
jobs:
|
||||||
|
- openstack-tox-py36 # bionic
|
||||||
|
- openstack-tox-py38 # focal
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
libffi-dev [platform:dpkg]
|
||||||
|
libxml2-dev [platform:dpkg]
|
||||||
|
libxslt1-dev [platform:dpkg]
|
||||||
|
python3-psutil [platform:dpkg]
|
|
@ -38,11 +38,12 @@ oslo.utils<=3.41.0;python_version<'3.6'
|
||||||
|
|
||||||
coverage>=4.5.2
|
coverage>=4.5.2
|
||||||
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
||||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
|
git+https://github.com/openstack-charmers/zaza.git@stable/ussuri#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/ussuri#egg=zaza.openstack
|
||||||
|
|
||||||
# Needed for charm-glance:
|
# Needed for charm-glance:
|
||||||
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
|
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
|
||||||
|
tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
|
||||||
tempest<24.0.0;python_version<'3.6'
|
tempest<24.0.0;python_version<'3.6'
|
||||||
|
|
||||||
croniter # needed for charm-rabbitmq-server unit tests
|
croniter # needed for charm-rabbitmq-server unit tests
|
||||||
|
|
3
tox.ini
3
tox.ini
|
@ -26,6 +26,7 @@ requires =
|
||||||
pip < 20.3
|
pip < 20.3
|
||||||
virtualenv < 20.0
|
virtualenv < 20.0
|
||||||
setuptools < 50.0.0
|
setuptools < 50.0.0
|
||||||
|
tox < 4.0.0
|
||||||
|
|
||||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||||
minversion = 3.18.0
|
minversion = 3.18.0
|
||||||
|
@ -84,7 +85,7 @@ deps = -r{toxinidir}/requirements.txt
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
charm-tools==2.8.3
|
charm-tools<3.0.0
|
||||||
commands = flake8 {posargs} hooks unit_tests tests actions lib files
|
commands = flake8 {posargs} hooks unit_tests tests actions lib files
|
||||||
charm-proof
|
charm-proof
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue