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

[Barry Price]

Modernise, switch to python3 exclusively

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

Typo

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

Unmerged commits

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

Typo

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

Modernise, switch to python3 exclusively

diff --git a/Makefile b/Makefile
index c3b3ca6..03544a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,22 @@
-version := $(shell python -c "from spade import __version__; print(__version__)")
-tempfiles_whl := build dist spade.egg-info
-tempfiles_snap := snapcraft.yaml parts prime stage spade*.snap
-tempfiles_misc := spade/__pycache__
-tempfiles_export := spade-export spade-export27.tar.gz
+version := $(shell python3 -c "from spade import __version__; print(__version__)")
+tempfiles_snap := snap/snapcraft.yaml spade*.snap
 
-whl: whl_clean
-	python3 setup.py bdist_wheel
+blacken:
+	@echo "Normalising python layout with black (but not really)."
 
-whl_clean:
-	rm -Rf $(tempfiles_whl)
+lint: blacken
+	@echo "Running flake8"
+	@tox -e lint
+
+clean:
+	@echo "Cleaning files"
+	@git clean -fXd
 
 snap: snap_clean
-	sed -e "s/{{VERSION}}/$(version)/" snapcraft.yaml.in > snapcraft.yaml
+	sed -e "s/{{VERSION}}/$(version)/" snapcraft.yaml.in > snap/snapcraft.yaml
 	snapcraft
 
 snap_clean:
 	rm -Rf $(tempfiles_snap)
 
-clean: whl_clean snap_clean
-
-lint:
-	@find spade -name \*py | xargs flake8 --config=/dev/null --ignore=C901 --max-line-length=120 --max-complexity=10 --hang-closing
+.PHONY: blacken lint clean snap snap_clean
diff --git a/setup.py b/setup.py
index e52b204..7286fa2 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import re
 here = path.abspath(path.dirname(__file__))
 
 def find_version(*file_paths):
-    with open(path.join(here, *file_paths), 'r', 'latin1') as f:
+    with open(path.join(here, *file_paths), 'r', 'utf-8') as f:
         version_file = f.read()
     version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
                               version_file, re.M)
diff --git a/snap/.snapcraft/state b/snap/.snapcraft/state
deleted file mode 100644
index 3497788..0000000
--- a/snap/.snapcraft/state
+++ /dev/null
@@ -1,3 +0,0 @@
-!GlobalState
-assets:
-  build-packages: []
diff --git a/spade/spade.py b/spade/spade.py
index c0404a2..c000805 100755
--- a/spade/spade.py
+++ b/spade/spade.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..b1b3e16
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,34 @@
+[tox]
+skipsdist=True
+envlist = unit, functional
+
+[testenv]
+basepython = python3
+
+[testenv:unit]
+commands =
+    pytest --ignore mod --ignore {toxinidir}/tests/functional \
+      {posargs:-v  --cov=spade --cov-report=term-missing --cov-branch}
+deps = -r{toxinidir}/tests/unit/requirements.txt
+       -r{toxinidir}/requirements.txt
+setenv =
+  PYTHONPATH={toxinidir}/spade
+  TZ=UTC
+
+[testenv:black]
+commands = black --skip-string-normalization --line-length=120 spade/ tests/
+deps = black
+
+[testenv:lint]
+commands = flake8 spade/ tests/
+# Pin flake8 to 3.7.9 to match focal
+deps =
+    flake8==3.7.9
+
+[flake8]
+exclude =
+    .git,
+    __pycache__,
+    .tox,
+max-line-length = 120
+max-complexity = 10