commit 174687b7e27bc3fa7b74fe62cd44ca7abb8b553a Author: Alex Kavanagh 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: I4414348e78930fa9562c6adab058ada8ae57a958 diff --git a/rebuild b/rebuild index 480c457..b74819d 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 -d9c8c19e-d02c-11ea-b5eb-4b6e4783f427 +89a0120c-0016-11eb-a7c2-8bbb29efd0a5 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