commit 0e6c47a625902d79aac79b439f61daccf411ae46
Author: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date:   Sat Sep 26 18:27:01 2020 +0100

    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
    
    Change-Id: I464fa7903727af1e8f6d6d888c6d30f2b9d4ad79

diff --git a/rebuild b/rebuild
index 8ac7ca8..462248d 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
-d98f6390-d02c-11ea-aacb-637a59310819
+893f3860-0016-11eb-a4ca-1b5c95070127
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
diff --git a/unit_tests/test_aodh_handlers.py b/unit_tests/test_aodh_handlers.py
index bdd4efb..79b31cb 100644
--- a/unit_tests/test_aodh_handlers.py
+++ b/unit_tests/test_aodh_handlers.py
@@ -128,10 +128,10 @@ class TestAodhHandlers(unittest.TestCase):
                 self.assertTrue(f in p.keys(),
                                 "{} not found".format(f))
                 # check that the lists are equal
-                l = []
+                items = []
                 for a in args:
-                    l += a['args'][:]
-                self.assertEqual(sorted(l), sorted(p[f]),
+                    items += a['args'][:]
+                self.assertEqual(sorted(items), sorted(p[f]),
                                  "{}: incorrect state registration".format(f))
 
     def test_install_packages(self):