Merge changes Iacd2f028,I43a6d573,Ibb6c93bb

* changes:
  Secure Key Management
  Improved integration tests
  [WIP] Multi-vdu, multi-charm support

diff --git a/Makefile b/Makefile
index 51e19b4..abc2c39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,5 @@ test: lint
        tox
 lint:
        tox -e lint
+package:
+       python3 setup.py --command-packages=stdeb.command bdist_deb

diff --git a/juju b/juju
new file mode 120000 (symlink)
index 0000000..1d37c18
--- /dev/null
+++ b/juju
@@ -0,0 +1 @@
+modules/libjuju/juju
\ No newline at end of file

diff --git a/setup.py b/setup.py
index 1450a15..b27dcbe 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,12 +12,12 @@
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
 
-from pathlib import Path
 from setuptools import setup, find_packages
 
 setup(
     name='N2VC',
-    version=0.1,
+    version_command=('git describe --match v* --tags --long --dirty',
+                     'pep440-git-full'),
     packages=find_packages(
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=[
@@ -29,8 +29,8 @@ setup(
         'paramiko',
     ],
     include_package_data=True,
-    maintainer='',
-    maintainer_email='',
+    maintainer='Adam Israel',
+    maintainer_email='adam.israel@canonical.com',
     description=(''),
     url='',
     license='Apache 2',

diff --git a/stdeb.cfg b/stdeb.cfg
new file mode 100644 (file)
index 0000000..c07507b
--- /dev/null
+++ b/stdeb.cfg
@@ -0,0 +1,5 @@
+[DEFAULT]
+Suite: xenial
+XS-Python-Version: >= 3.5
+Maintainer: Adam Israel <adam.israel@canonical.com>
+Depends: python3-pip