From c43ae5147e0303c04fe70d9bd0aaa4bd696939f1 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Tue, 7 Mar 2023 14:31:42 +0000
Subject: [PATCH] Fixes for tox 4 on focal (ZOSCI system)

The zosci 3rd party CI has updated to using focal and tox 4 by default
for the runners, so these fixes ensure that the main development branch
continues to be compatible.

Change-Id: I95c5cf033ce077664c7a221d43b13dfe8d3ac504
Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1028
---
 requirements.txt | 2 +-
 tox.ini          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 6480df4..2394c05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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; python_version < '3.10'
+charm-tools==2.8.5; python_version < '3.10'
 charm-tools; python_version >= '3.10'
 
 simplejson
diff --git a/tox.ini b/tox.ini
index a25f869..ab5d020 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@ allowlist_externals =
     charmcraft
     bash
     tox
-    rename.sh
+    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt