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 included in this patch:
- Cherry-pick from commit 24d557ffdc
- Cherry-pick from commit f22bb10257
- Add bindep.txt to install standard binary dependencies. These
  appear to no longer be required on master.
- Switch charm-tools to 2.8.4 to remove ruamel requirement that
  doesn't work on Python 3.10.

Related-Bug: #2002788
Change-Id: I231f6c19a574bb3f337451c98d2f7a8c0bafd65c
This commit is contained in:
Corey Bryant 2023-01-20 15:11:16 -05:00
parent 881edb5d14
commit c3425ec662
4 changed files with 12 additions and 10 deletions

4
bindep.txt Normal file
View File

@ -0,0 +1,4 @@
libffi-dev [platform:dpkg]
libpq-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]

View File

@ -65,7 +65,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: yoga/edge
keystone:
charm: ch:keystone
@ -75,17 +75,17 @@ applications:
admin-password: openstack
to:
- '7'
channel: latest/edge
channel: yoga/edge
nagios:
charm: cs:nagios
charm: ch:nagios
series: bionic # not supported on focal yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
charm: ch:nrpe
relations:

View File

@ -17,9 +17,6 @@ machines:
'5':
'6':
'7':
'8':
series: bionic # nagios not supported on focal+ yet
applications:
@ -65,7 +62,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: yoga/edge
keystone:
charm: ch:keystone
@ -75,7 +72,7 @@ applications:
admin-password: openstack
to:
- '7'
channel: latest/edge
channel: yoga/edge
relations:

View File

@ -26,6 +26,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
@ -84,7 +85,7 @@ deps = -r{toxinidir}/requirements.txt
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2
charm-tools==2.8.3
charm-tools==2.8.4
commands = flake8 {posargs} hooks unit_tests tests actions lib files
charm-proof