From 83f79a373cd9d3cbc710bd959f423809edf91099 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 17 Aug 2023 13:55:52 +0100 Subject: [PATCH] [xena] Ensure get_requests_for_local_unit doesn't fail on incomplete relation This is a rebuild/make sync for charms to pickup the fix in charmhelpers to fix any inadvertant accesses of ['ca'] in the relation data before it is available from vault in the certificates relation. Fix in charmhelpers is in [1]. [1] https://github.com/juju/charm-helpers/pull/828 Closes-Bug: #2028683 Change-Id: Icaf60ab6103af1695a1f2aa3efab3546710f50de --- bindep.txt | 4 ++++ rebuild | 2 +- src/build.lock | 6 ++++++ tox.ini | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 bindep.txt diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..17575d9 --- /dev/null +++ b/bindep.txt @@ -0,0 +1,4 @@ +libffi-dev [platform:dpkg] +libpq-dev [platform:dpkg] +libxml2-dev [platform:dpkg] +libxslt1-dev [platform:dpkg] diff --git a/rebuild b/rebuild index 89b0bc4..a2075c6 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 -29db81ad-4d4a-471d-9927-f0a94aa19bd8 +44845fca-3ce0-11ee-9c23-f3b903e9e264 diff --git a/src/build.lock b/src/build.lock index a6c270f..7c18983 100644 --- a/src/build.lock +++ b/src/build.lock @@ -261,6 +261,12 @@ "package": "urllib3", "vcs": null, "version": "1.26.7" + }, + { + "type": "python_module", + "package": "Cython", + "vcs": null, + "version": "0.29.36" } ] } \ No newline at end of file diff --git a/tox.ini b/tox.ini index 9a79c57..5ffae04 100644 --- a/tox.ini +++ b/tox.ini @@ -97,7 +97,8 @@ commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - charm-tools==2.8.3 + PyYAML==6.0.1 + charm-tools==2.8.6 commands = flake8 {posargs} src unit_tests [testenv:func-target]