From 458af8aaf66b4ec0c5ecb057abb395e403341b04 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Mon, 27 Jul 2020 20:09:24 +0100
Subject: [PATCH] Release sync for 20.08

- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt

Change-Id: If1bf8dbceba3aff96aeee6e5bf710185d1ed9612
---
 rebuild                   |  2 +-
 src/test-requirements.txt | 17 ++++++-----------
 src/tox.ini               |  2 +-
 test-requirements.txt     | 18 ++++++++++++++----
 tox.ini                   |  5 +++++
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/rebuild b/rebuild
index fddb2ab..9d7789d 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-917e1d08-a4d0-11ea-8fb8-332b1d5ca7cc
+d99b6438-d02c-11ea-9216-238ea56f93d6
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index 7e9d609..d3c9be8 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -1,13 +1,8 @@
-# This file is managed centrally.  If you find the need to modify this as a
-# one-off, please don't.  Intead, consult #openstack-charms and ask about
-# requirements management in charms via bot-control.  Thank you.
-charm-tools>=2.4.4
-coverage>=3.6
-mock>=1.2
-flake8>=2.2.4,<=2.4.1
-stestr>=2.2.0
-requests>=2.18.4
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of *requirements.txt files for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
-pytz    # workaround for 14.04 pip/tox
-pyudev  # for ceph-* charm unit tests (not mocked?)
diff --git a/src/tox.ini b/src/tox.ini
index 9c27bbf..07a7adc 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -47,4 +47,4 @@ commands =
     functest-run-suite --keep-model --bundle {posargs}
 
 [testenv:venv]
-commands = {posargs}
\ No newline at end of file
+commands = {posargs}
diff --git a/test-requirements.txt b/test-requirements.txt
index 94b9796..0ab97f6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,10 @@
-# This file is managed centrally.  If you find the need to modify this as a
-# one-off, please don't.  Intead, consult #openstack-charms and ask about
-# requirements management in charms via bot-control.  Thank you.
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of *requirements.txt files for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
 #
 # Lint and unit test requirements
-flake8>=2.2.4
+flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 requests>=2.18.4
 charms.reactive
@@ -11,3 +12,12 @@ mock>=1.2
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+#
+# Revisit for removal / mock improvement:
+netifaces        # vault
+psycopg2-binary  # vault
+tenacity         # vault
+pbr              # vault
+cryptography     # vault, keystone-saml-mellon
+lxml             # keystone-saml-mellon
+hvac             # vault, barbican-vault
diff --git a/tox.ini b/tox.ini
index 5b41c1d..afd48f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,6 +50,11 @@ basepython = python3.7
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py38]
+basepython = python3.8
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt