Merge ~barryprice/spade/+git/spade:snapcraft into spade:master

[Barry Price]

Snapcraft fixes for core20

c85283a... by Barry Price on 2020-11-27

Typo

6817bc5... by Barry Price on 2020-11-27

Merge branch 'master' into flake8

1734965... by Barry Price on 2020-11-27

Merge branch 'flake8' into black

fae038f... by Barry Price on 2020-11-27

Snapcraft fixes, and ignore built snap files

dd61da3... by Barry Price on 2020-11-27

Merge branch 'black' into snapcraft

Unmerged commits

dd61da3... by Barry Price on 2020-11-27

Merge branch 'black' into snapcraft

fae038f... by Barry Price on 2020-11-27

Snapcraft fixes, and ignore built snap files

1734965... by Barry Price on 2020-11-27

Merge branch 'flake8' into black

6817bc5... by Barry Price on 2020-11-27

Merge branch 'master' into flake8

c85283a... by Barry Price on 2020-11-27

Typo

a86afa5... by Barry Price on 2020-11-27

Reformatted with black

aa2d273... by Barry Price on 2020-11-27

Address all Flake8 errors bar complexity (noqa: C901)

7e34f18... by Barry Price on 2020-11-27

Modernise, switch to python3 exclusively

diff --git a/Makefile b/Makefile
index ceb744e..0efca2a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-version := $(shell python3 -c "from spade import __version__; print(__version__)")
-tempfiles_snap := snap/snapcraft.yaml spade*.snap
+tempfiles_snap := snap/.snapcraft spade_*.snap parts/ prime/ stage/
 
 blacken:
 	@echo "Normalising python layout with black"
@@ -14,7 +13,7 @@ clean:
 	@git clean -fXd
 
 snap: snap_clean
-	sed -e "s/{{VERSION}}/$(version)/" snapcraft.yaml.in > snap/snapcraft.yaml
+	@export SNAPCRAFT_BUILD_ENVIRONMENT=multipass
 	snapcraft
 
 snap_clean:
diff --git a/setup.py b/setup.py
index 7286fa2..efd69bd 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@ setup(
     author_email="[e-mail]",
     license='LICENSE',
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
+    setup_requires=['wheel'],
     install_requires=[
         "python-swiftclient",
         "python-keystoneclient",
diff --git a/snapcraft.yaml.in b/snap/snapcraft.yaml
 similarity index 74%
 rename from snapcraft.yaml.in
 rename to snap/snapcraft.yaml
index 9f56fb4..8c9a196 100644
--- a/snapcraft.yaml.in
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,6 @@
 name: spade
-version: 1.0
+version: '1.0'
+base: core20
 summary: A tool for managing buckets in the cloud
 description: A tool to simplify accessing objects in cloud storage
   buckets (Amazon S3, Azure blobstore, Google cloud storage,
@@ -11,8 +12,14 @@ grade: stable
 apps:
   spade:
     command: bin/spade
+    environment:
+      PATH: ${SNAP}/bin:${PATH}
+      PYTHONPATH: ${SNAP}/lib/python3
 parts:
   spade:
     plugin: python
-    python-version: python3
     source: .
+    build-environment:
+      - PYTHONPATH: "$SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages"
+    stage-packages:
+      - python3-wheel