From 1061d7d7f084db7b36c0775d3ef5909bf5d26cce Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Thu, 15 Aug 2019 12:35:58 +0200
Subject: [PATCH] Distribute direct charm dependencies

Do not rely on system installed Python packages but distribute the
direct charm dependencies as part of the charms wheelhouse.

As the span of distributions we need to support with reactive
charms widens we will run into compability problems with the
current model.

For further reference see juju/charm-helpers#341 and
juju-solutions/layer-basic#135

Change-Id: I11fb4020dc358c40bf9c1870e94186ba7e97c2db
---
 src/layer.yaml            | 3 +--
 src/test-requirements.txt | 2 +-
 src/wheelhouse.txt        | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 src/wheelhouse.txt

diff --git a/src/layer.yaml b/src/layer.yaml
index fca619a..1d6dd1a 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -3,5 +3,4 @@ repo: https://github.com/openstack-charmers/charm-keystone-saml-mellon
 options:
   basic:
     use_venv: True
-    include_system_packages: True
-    packages: ['python3-lxml', 'python3-cryptography']
+    packages: [ 'libffi-dev', 'libssl-dev', 'libxslt1-dev' ]
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index f6c9167..256315f 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -6,5 +6,5 @@ stestr>=2.2.0
 python-keystoneclient>=1.7.1
 python-swiftclient
 lxml
-git+https://github.com/openstack-charmers/zaza.git@remove-namespaced-tests#egg=zaza;python_version>='3.0'
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
new file mode 100644
index 0000000..49c619b
--- /dev/null
+++ b/src/wheelhouse.txt
@@ -0,0 +1,5 @@
+cryptography
+lxml
+
+jinja2
+psutil