From 6e92e69a05759d09653e14261e83fbd7d4d933f7 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 17 Aug 2023 20:43:26 +0100 Subject: [PATCH] [victoria] 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]. Added libpq-dev to bindep.txt for psycopg2-binary as wheel doesn't exist on py36. [1] https://github.com/juju/charm-helpers/pull/830 Closes-Bug: #2028683 Change-Id: I6bef17dd4eb4e383639940357a9bc2875e01eee7 --- bindep.txt | 1 + rebuild | 2 +- src/build.lock | 6 ++++++ tox.ini | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 bindep.txt diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..3e8fd0c --- /dev/null +++ b/bindep.txt @@ -0,0 +1 @@ +libpq-dev [platform:dpkg] diff --git a/rebuild b/rebuild index c91a823..053b4f0 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 -fdb2c6cd-5f92-40c2-9af1-fecff8a72d87 +dadf2b58-3d21-11ee-836e-4345a0b1b02a diff --git a/src/build.lock b/src/build.lock index fa6aa62..3eb442b 100644 --- a/src/build.lock +++ b/src/build.lock @@ -225,6 +225,12 @@ "package": "pyaml", "vcs": null, "version": "21.10.1" + }, + { + "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 782b398..ff8c050 100644 --- a/tox.ini +++ b/tox.ini @@ -92,7 +92,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]