From 62d5a501259eb16936fea073d7791e64637290f8 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 27 Jul 2020 20:09:25 +0100 Subject: [PATCH] Release sync for 20.08 - Classic charms: sync charm-helpers. - Classic ceph based charms: also sync charms.ceph - Reactive charms: trigger a rebuild - sync tox.ini - sync requirements.txt and test-requirements.txt Change-Id: I7ba3dfe49440c474d43bda1fa8f7664581050fc8 --- rebuild | 2 +- requirements.txt | 11 +++++++++-- src/files/.gitkeep | 0 src/test-requirements.txt | 2 +- test-requirements.txt | 22 +++++++++++++++++++--- 5 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 src/files/.gitkeep diff --git a/rebuild b/rebuild index 4eb28b4..e190b41 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 -920cf37a-a4d0-11ea-aa4d-0ba7611f1c97 +da19e560-d02c-11ea-a8dd-c74992f5a84e diff --git a/requirements.txt b/requirements.txt index 6371beb..5f2fff3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,10 @@ -# Requirements to build the charm -charm-tools +# This file is managed centrally by release-tools and should not be modified +# within individual charm repos. See the 'global' dir contents for available +# choices of *requirements.txt files for OpenStack Charms: +# https://github.com/openstack-charmers/release-tools +# +# Build requirements +charm-tools>=2.4.4 +# importlib-resources 1.1.0 removed Python 3.5 support +importlib-resources<1.1.0 simplejson diff --git a/src/files/.gitkeep b/src/files/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/test-requirements.txt b/src/test-requirements.txt index b4edb8f..d3c9be8 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -5,4 +5,4 @@ # # 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/javacruft/zaza-openstack-tests.git@triliovault-testing#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/test-requirements.txt b/test-requirements.txt index 4d70242..0ab97f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,23 @@ -# Unit test requirements -flake8>=2.2.4 +# This file is managed centrally by release-tools and should not be modified +# within individual charm repos. See the 'global' dir contents for available +# choices of *requirements.txt files for OpenStack Charms: +# https://github.com/openstack-charmers/release-tools +# +# Lint and unit test requirements +flake8>=2.2.4,<=2.4.1 stestr>=2.2.0 +requests>=2.18.4 charms.reactive mock>=1.2 +nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +# +# Revisit for removal / mock improvement: +netifaces # vault +psycopg2-binary # vault +tenacity # vault +pbr # vault +cryptography # vault, keystone-saml-mellon +lxml # keystone-saml-mellon +hvac # vault, barbican-vault