Merge ~stub/charm-test:snap into charm-test:master

[Stuart Bishop]

Snap and distutils packaging

Do the snapcraft dance to transform the 7k Python script into a 13.5MB snap. Or upload it to pip and pip install it, because the easiest way to write the snapcraft.yaml is to create a Python setup.py

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

LGTM, with a minimal update to README.md

review: Approve

[Tom Haddon (mthaddon)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 248a3d967021b446f71cc965c937c9b360ef8154

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b424693
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+build/
+snap/.snapcraft
+parts/
+prime/
+stage/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c9d7087
--- /dev/null
+++ b/README.md
@@ -0,0 +1,18 @@
+= charm-test
+
+charm-test will run a charm's tests in an lxd container. Charms
+need to provide the necessary makefile targets, per the charm-test
+protocol.
+
+== Charm requirements
+
+Charms need to provide a Makefile in the top level directory with the
+following targets:
+
+* charmbuild: Build the charm into `${BUILDDEST}`
+
+* testdeps: Install all dependencies into the container required to
+  run the tests.
+
+* test: Run the tests. The default Juju model is available, eg. for
+  amulet tests.
diff --git a/charm-test b/charm-test
new file mode 120000
index 0000000..7672cfc
--- /dev/null
+++ b/charm-test
@@ -0,0 +1 @@
+charm_test.py
\ No newline at end of file
diff --git a/charm-test.py b/charm-test.py
deleted file mode 120000
index a024413..0000000
--- a/charm-test.py
+++ /dev/null
@@ -1 +0,0 @@
-charm-test
\ No newline at end of file
diff --git a/charm-test b/charm_test.py
index 97be0ca..97be0ca 100755
--- a/charm-test
+++ b/charm_test.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..085d36b
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,21 @@
+import setuptools
+
+with open('README.md', 'r') as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name='charm-test',
+    version='0.0.1',
+    author='Tom Haddon',
+    author_email='[e-mail]',
+    description="Run a Juju charm's test suite",
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    url='https://launchpad.net/charm-test',
+    py_modules=['charm_test'],
+    entry_points={
+        'console_scripts': [
+            'charm-test=charm_test:main',
+        ],
+    },
+)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 0000000..06fdfbe
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,22 @@
+name: charm-test
+version: auto
+version-script: git describe --dirty --always --tags | sed -r 's/v(.*)/\1/g'
+summary: Run charm tests in containment
+description: >
+    charm-test will run a charm's tests in an lxd container. Charms
+    need to provide the necessary makefile targets, per the charm-test
+    protocol.
+grade: stable
+confinement: classic
+apps:
+  charm-test:
+    command: usr/bin/python3 $SNAP/bin/charm-test
+parts:
+  charm-test:
+    plugin: python
+    python-version: python3
+    source: .
+    python-packages:
+        - pyyaml
+    stage-packages:
+        - libc6