Merge remote-tracking branch 'origin/master' into edge

Makefile

@@ -1,3 +1,6 @@
+ifndef MIG_ENV
+	MIG_ENV = 'local'
+endif
 ifeq ($(PY),2)
 	PYTHON_BIN = './envhelp/python2'
 else
@@ -17,6 +20,14 @@ info:
 	@echo "'make test'      - run the test suite"
 	@echo "'make PY=2 test' - run the test suite (python 2)"
 
+.PHONY: fmt
+fmt:
+ifneq ($(MIG_ENV),'local')
+	@echo "unavailable outside local development environment"
+	@exit 1
+endif
+	$(PYTHON_BIN) -m autopep8 --ignore E402 -i
+
 .PHONY: clean
 clean:
 	@rm -f ./envhelp/py2.imageid
@@ -35,10 +46,19 @@ test: dependencies
 .PHONY: dependencies
 dependencies: ./envhelp/venv/pyvenv.cfg ./envhelp/py3.depends
 
+ifeq ($(MIG_ENV),'local')
+./envhelp/py3.depends: $(REQS_PATH) local-requirements.txt
+else
 ./envhelp/py3.depends: $(REQS_PATH)
+endif
 	@rm -f ./envhelp/py3.depends
 	@echo "installing dependencies from $(REQS_PATH)"
 	@./envhelp/venv/bin/pip3 install -r $(REQS_PATH)
+ifeq ($(MIG_ENV),'local')
+	@echo ""
+	@echo "installing development dependencies"
+	@./envhelp/venv/bin/pip3 install -r local-requirements.txt
+endif
 	@touch ./envhelp/py3.depends
 
 ./envhelp/venv/pyvenv.cfg:

local-requirements.txt

@@ -0,0 +1,3 @@
+# migrid dependencies on a format suitable for pip install as described on
+# https://pip.pypa.io/en/stable/reference/requirement-specifiers/
+autopep8