openstack/charm-magnum
Code Issues Proposed changes

Sync release-tools

Browse Source 
In order to fix ResolutionImpossible on tox invocation.

https://github.com/openstack-charmers/release-tools/issues/151
https://github.com/openstack-charmers/release-tools/pull/152

Change-Id: I015bc4d424407b9f9ca831181a6cdf398b91fc4d
This commit is contained in:
Aurelien Lourot 2021-07-22 14:55:53 +02:00
parent c6076f91b1
commit a4208dc0b5
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

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

6
src/test-requirements.txt
View File

@ -3,12 +3,6 @@
# choices of *requirements.txt files for OpenStack Charms: # choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools # 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!) # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza.git#egg=zaza

12
test-requirements.txt
View File

@ -4,8 +4,6 @@
# https://github.com/openstack-charmers/release-tools # https://github.com/openstack-charmers/release-tools
# #
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# Lint and unit test requirements
flake8>=2.2.4
stestr>=2.2.0 stestr>=2.2.0
@ -38,10 +36,16 @@ coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
# #
# Revisit for removal / mock improvement: # Revisit for removal / mock improvement:
#
# NOTE(lourot): newer versions of cryptography require a Rust compiler to build,
# see
# * https://github.com/openstack-charmers/zaza/issues/421
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
#
netifaces # vault netifaces # vault
psycopg2-binary # vault psycopg2-binary # vault
tenacity # vault tenacity # vault
pbr # vault pbr==5.6.0 # vault
cryptography # vault, keystone-saml-mellon cryptography<3.4 # vault, keystone-saml-mellon
lxml # keystone-saml-mellon lxml # keystone-saml-mellon
hvac # vault, barbican-vault hvac # vault, barbican-vault

3
tox.ini
View File

@ -62,7 +62,8 @@ commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps = flake8==3.9.2
charm-tools==2.8.3
commands = flake8 {posargs} src unit_tests commands = flake8 {posargs} src unit_tests
[testenv:cover] [testenv:cover]