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: Icf6ef2ae4b845f4dc612a5d949144eb5c11030b1

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
-d9be31fc-d02c-11ea-90cf-6f787574a97c
+898d0d56-0016-11eb-940f-8358d6af3fcb

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

src/reactive/gnocchi_handlers.py

@@ -89,7 +89,7 @@ def storage_backend_connection():
                             "{}".format(e), hookenv.DEBUG)
                 reactive.clear_flag('gnocchi-storage-network.ready')
                 return
-            except botocore.exceptions.SSLError as e:
+            except botocore.exceptions.SSLError:
                 # this status check does not check for ssl validation
                 reactive.set_flag('gnocchi-upgrade.ready')
                 return

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

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

unit_tests/__init__.py

@@ -15,9 +15,11 @@
 import mock
 import sys
 
+
 sys.path.append('src')
 sys.path.append('src/lib')
 
+
 # Mock out charmhelpers so that we can test without it.
 import charms_openstack.test_mocks  # noqa
 charms_openstack.test_mocks.mock_charmhelpers()
@@ -39,6 +41,7 @@ def mock_more_stuff():
         charmhelpers.contrib.storage.linux.ceph
     )
 
+
 boto3 = mock.MagicMock()
 botocore = mock.MagicMock()
 sys.modules['boto3'] = boto3