Merge remote-tracking branch 'refs/remotes/origin/master'

Makefile

@@ -0,0 +1,20 @@
+PYTHON := python
+
+DEPLOY_DIR ?= /var/www/wsgi/django-dav-events
+
+.PHONY: default help test deploy
+
+default:	help
+
+help:
+	@echo "The make stuff is used by our CI/CD buildbot."
+
+test:
+	tox
+
+deploy:
+	git -C "$(DEPLOY_DIR)/src/django-dav-events" pull
+	"$(DEPLOY_DIR)/python/bin/python" "$(DEPLOY_DIR)/django/manage.py" migrate --noinput
+	"$(DEPLOY_DIR)/python/bin/python" "$(DEPLOY_DIR)/django/manage.py" collectstatic --noinput
+	touch "$(DEPLOY_DIR)/django/main/wsgi.py"
+