commit 744b5759e99733915edacdf780f25c70cd74b3e0 Author: Alex Kavanagh Date: Sat Sep 26 18:27:02 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: I9c96f6170e1ff0ac123bccc6fe3faf7a576e5a7b diff --git a/rebuild b/rebuild index e0cab3f..dcf9608 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 -d9e302ac-d02c-11ea-8da7-13936801ad3e +89c52970-0016-11eb-879a-4fb9d744ed15 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 1c8aff7..d078e27 100644 --- a/test-requirements.txt +++ b/test-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 # Lint and unit test requirements flake8>=2.2.4 stestr>=2.2.0 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