Merge "Sync libraries & common files prior to freeze"

2020-09-30 07:10:26 +00:00 · 2020-09-30 07:10:26 +00:00 · 8eef7d0c39
parent 56946244f9 f318c00671
commit 8eef7d0c39
3 changed files with 3 additions and 1 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -7,6 +7,7 @@
 #       requirements.  They are intertwined.  Also, Zaza itself should specify
 #       all of its own requirements and if it doesn't, fix it there.
 #
+setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 pbr>=1.8.0,<1.9.0
 simplejson>=2.2.0
 netifaces>=0.10.4
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -7,6 +7,7 @@
 #       requirements.  They are intertwined.  Also, Zaza itself should specify
 #       all of its own requirements and if it doesn't, fix it there.
 #
+setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 charm-tools>=2.4.4
 requests>=2.18.4
 mock>=1.2
--- a/tox.ini
+++ b/tox.ini
@ -116,5 +116,5 @@ commands =
    functest-run-suite --keep-model --bundle {posargs}

 [flake8]
-ignore = E402,E226,W504
+ignore = E402,E226,W503,W504
 exclude = */charmhelpers