[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] juju/charm-helpers#828
Closes-Bug: #2028683

Change-Id: Ieb16b5600c7bf66931083fbedbd1402dcab26bfe

.zuul.yaml

@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-charm-jobs
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-xena-jobs
       - openstack-cover-jobs

bindep.txt

@@ -0,0 +1,4 @@
+libffi-dev [platform:dpkg]
+libpq-dev [platform:dpkg]
+libxml2-dev [platform:dpkg]
+libxslt1-dev [platform:dpkg]

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
-e35f0bbe-c4e5-45d0-8337-608defab3846
+447a09d0-3ce0-11ee-85f8-f7a7177fea4d

src/build.lock

@@ -182,7 +182,7 @@
       "type": "python_module",
       "package": "charms.openstack",
       "url": "git+https://github.com/openstack/charms.openstack.git",
-      "branch": "refs/heads/stable/21.10",
+      "branch": "refs/heads/stable/xena",
       "version": "10627ee5f991c268f174d6d100e218a0e1867af1",
       "vcs": "git"
     },
@@ -202,7 +202,7 @@
       "type": "python_module",
       "package": "charmhelpers",
       "url": "git+https://github.com/juju/charm-helpers.git",
-      "branch": "refs/heads/stable/21.10",
+      "branch": "refs/heads/stable/xena",
       "version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
       "vcs": "git"
     },
@@ -223,6 +223,12 @@
       "package": "pyaml",
       "vcs": null,
       "version": "21.10.1"
+    },
+    {
+      "type": "python_module",
+      "package": "Cython",
+      "vcs": null,
+      "version": "0.29.36"
     }
   ]
 }

test-requirements.txt

@@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
 
 nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git@stable/xena#egg=charms.openstack
 #
 # Revisit for removal / mock improvement:
 #

tox.ini

@@ -20,6 +20,7 @@ skip_missing_interpreters = False
 #   lead to fetching the latest pip in the func* tox targets, see
 #   https://stackoverflow.com/a/38133283
 requires =
+  tox < 4.0.0
   pip < 20.3
   virtualenv < 20.0
   setuptools<50.0.0
@@ -71,7 +72,10 @@ commands = stestr run --slowest {posargs}
 [testenv:py35]
 basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
+# the xena charm doesn't 'care' about PY35 as it won't ever be run on Xenial;
+# however the charm-unit-jobs-py38 zuul job invokes py35 target.  This is just to
+# keep it happy.
+commands = /bin/true
 
 [testenv:py36]
 basepython = python3.6
@@ -96,7 +100,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]