Fix ResolutionImpossible on tox invocation

Closes #151
openstack-charmers · Jul 22, 2021 · f3f650b · f3f650b
1 parent 91b1b2b
commit f3f650b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 24 deletions.
diff --git a/global/classic-zaza/requirements.txt b/global/classic-zaza/requirements.txt
@@ -7,7 +7,7 @@
 #       requirements.  They are intertwined.  Also, Zaza itself should specify
 #       all of its own requirements and if it doesn't, fix it there.
 #
-pbr>=1.8.0,<1.9.0
+pbr==5.6.0
 simplejson>=2.2.0
 netifaces>=0.10.4
 

diff --git a/global/classic-zaza/test-requirements.txt b/global/classic-zaza/test-requirements.txt
@@ -8,11 +8,6 @@
 #       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
-
-# Workaround until https://github.com/juju/charm-tools/pull/589 gets
-# published
-keyring<21
 
 requests>=2.18.4
 
@@ -21,7 +16,6 @@ requests>=2.18.4
 mock>=1.2,<4.0.0; python_version < '3.6'
 mock>=1.2; python_version >= '3.6'
 
-flake8>=2.2.4
 stestr>=2.2.0
 
 # Dependency of stestr. Workaround for
@@ -42,7 +36,7 @@ oslo.utils<=3.41.0;python_version<'3.6'
 
 coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
 
 # Needed for charm-glance:

diff --git a/global/classic-zaza/tox.ini b/global/classic-zaza/tox.ini
@@ -65,8 +65,8 @@ deps = -r{toxinidir}/requirements.txt
 
 [testenv:pep8]
 basepython = python3
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps = flake8==3.9.2
+       charm-tools==2.8.3
 commands = flake8 {posargs} hooks unit_tests tests actions lib files
            charm-proof
 

diff --git a/global/source-zaza/requirements.txt b/global/source-zaza/requirements.txt
@@ -11,10 +11,6 @@ setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
 # Build requirements
 charm-tools==2.8.3
 
-# Workaround until https://github.com/juju/charm-tools/pull/589 gets
-# published
-keyring<21
-
 simplejson
 
 # Newer versions use keywords that didn't exist in python 3.5 yet (e.g.

diff --git a/global/source-zaza/src/test-requirements.txt b/global/source-zaza/src/test-requirements.txt
@@ -3,12 +3,6 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
-# pep8 requirements
-charm-tools>=2.4.4
-
-# Workaround until https://github.com/juju/charm-tools/pull/589 gets
-# published
-keyring<21
 
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza

diff --git a/global/source-zaza/test-requirements.txt b/global/source-zaza/test-requirements.txt
@@ -4,8 +4,6 @@
 #     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
 
@@ -47,7 +45,7 @@ git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
 netifaces        # vault
 psycopg2-binary  # vault
 tenacity         # vault
-pbr              # vault
+pbr==5.6.0       # vault
 cryptography<3.4 # vault, keystone-saml-mellon
 lxml             # keystone-saml-mellon
 hvac             # vault, barbican-vault
diff --git a/global/source-zaza/tox.ini b/global/source-zaza/tox.ini
@@ -62,7 +62,8 @@ commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3
-deps = -r{toxinidir}/test-requirements.txt
+deps = flake8==3.9.2
+       charm-tools==2.8.3
 commands = flake8 {posargs} src unit_tests
 
 [testenv:cover]