From f2c8cc75b91c0f4e6a87bab8d42cee40d4d7f490 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Sat, 26 Sep 2020 18:27:02 +0100
Subject: [PATCH] Sync libraries & common files prior to freeze

* charm-helpers sync for classic charms
* charms.ceph sync for ceph charms
* rebuild for reactive charms
* sync tox.ini files as needed
* sync requirements.txt files to sync to standard

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/440
Change-Id: I10a6a748b8fee04a0395da37d599e0c50d28f01c
---
 rebuild               | 2 +-
 requirements.txt      | 1 +
 test-requirements.txt | 3 ++-
 tox.ini               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rebuild b/rebuild
index 82f9992..ff52c08 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
-d9ed2ec6-d02c-11ea-935f-4ff2388fe6af
+89d1b9f6-0016-11eb-abbe-1721e8bd2636
diff --git a/requirements.txt b/requirements.txt
index 5f2fff3..aaaa3e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 # Build requirements
 charm-tools>=2.4.4
 # importlib-resources 1.1.0 removed Python 3.5 support
diff --git a/test-requirements.txt b/test-requirements.txt
index 0ab97f6..d078e27 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,8 +3,9 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 # Lint and unit test requirements
-flake8>=2.2.4,<=2.4.1
+flake8>=2.2.4
 stestr>=2.2.0
 requests>=2.18.4
 charms.reactive
diff --git a/tox.ini b/tox.ini
index afd48f0..c91922e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,4 +94,4 @@ commands = {posargs}
 
 [flake8]
 # E402 ignore necessary for path append before sys module import in actions
-ignore = E402,W504
+ignore = E402,W503,W504