From fc1aed0efe55c52cf73c2cdaf5cc881fd771c7cb Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 12 Jan 2021 15:24:12 +0000 Subject: [PATCH] Updates for testing period for 20.01 release Includes updates to charmhelpers/charms.openstack for cert_utils and unit-get for the install hook error on Juju 2.9 * charm-helpers sync for classic charms * rebuild for reactive charms * ensure tox.ini is from release-tools * ensure requirements.txt files are from release-tools * On reactive charms: - ensure master branch for charms.openstack - ensure master branch for charm-helpers Change-Id: Ib7ef820804dc6a47ae5efdfbe4b3aa681103046a --- rebuild | 2 +- src/wheelhouse.txt | 4 ++++ test-requirements.txt | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rebuild b/rebuild index 8f76d45..b883984 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 -5005e1ba-0e2c-11eb-9990-bfde8811b245 +82eeb69e-5745-11eb-a017-1bac08bb14fb diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 8650899..c49f653 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,3 +1,7 @@ cryptography lxml psutil + +git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack + +git+https://github.com/juju/charm-helpers.git#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 8ab24b2..3f08524 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -22,6 +22,8 @@ importlib-resources<3.0.0; python_version < '3.6' # dropped support for python 3.5: osprofiler<2.7.0;python_version<'3.6' stevedore<1.31.0;python_version<'3.6' +debtcollector<1.22.0;python_version<'3.6' +oslo.utils<=3.41.0;python_version<'3.6' requests>=2.18.4 charms.reactive