From 015e02acd3d96a6a89637dfaa6ae8902b475b284 Mon Sep 17 00:00:00 2001
From: Nobuto Murata <nobuto.murata@canonical.com>
Date: Thu, 19 Jan 2023 11:50:29 +0900
Subject: [PATCH] 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.

Additionally, accommodate the following changes by hand from
origin/master:
- add libffi-dev in bindep.txt
- update pinning of charm-tools
  (but not unpinning to be in-sync with origin/master)
- update pinning of tempest

Related-Bug: #2002788
Change-Id: I8f4c84b412ed83c4f1a1f79ac87ec8ee57074fe1
---
 bindep.txt            | 1 +
 test-requirements.txt | 3 ++-
 tox.ini               | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index ba2ccb4b..9cce56b5 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -2,3 +2,4 @@ libxml2-dev [platform:dpkg test]
 libxslt1-dev [platform:dpkg test]
 build-essential [platform:dpkg test]
 zlib1g-dev [platform:dpkg test]
+libffi-dev [platform:dpkg test]
diff --git a/test-requirements.txt b/test-requirements.txt
index 34a33dc7..63b62d6e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -44,7 +44,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
 
 # 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'
 
 croniter            # needed for charm-rabbitmq-server unit tests
diff --git a/tox.ini b/tox.ini
index f4e8a47c..623fdf6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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