Merge branch 'develop' into CC-5-deed-translation-workflow

# Conflicts:
#	licenses/management/commands/import_index_rdf.py

Author: dpoirier

.travis.yml

@@ -3,7 +3,7 @@ language: python
 sudo: false
 
 python:
-  - "3.8"
+  - "3.7"
 
 # Match postgresql version to that in conf/pillar/project.sls
 services:

Makefile

@@ -1,7 +1,6 @@
+# This makefile assumes you're activated your virtual environment first.
 PROJECT_NAME = cc_licenses
 STATIC_DIR = ./$(PROJECT_NAME)/static
-WORKON_HOME ?= $(HOME)/.virtualenvs
-VENV_DIR ?= $(WORKON_HOME)/$(PROJECT_NAME)
 
 default: lint test
 
@@ -11,7 +10,7 @@ test:
 	python manage.py makemigrations --dry-run | grep 'No changes detected' || \
 		(echo 'There are changes which require migrations.' && exit 1)
 	coverage run manage.py test --noinput
-	coverage report -m --fail-under 80
+	coverage report -m --fail-under 98
 
 lint-py:
 	# Check for Python formatting issues
@@ -52,14 +51,14 @@ pullmessages:
 	tx pull -af
 
 setup:
-	virtualenv -p `which python3.8` $(VENV_DIR)
-	$(VENV_DIR)/bin/pip install -U pip wheel
-	$(VENV_DIR)/bin/pip install -Ur requirements/dev.txt
-	$(VENV_DIR)/bin/pip freeze
+	if [ "${VIRTUAL_ENV}" = "" ] ; then echo "Please create and activate a python 3.7 virtual environment, then try again"; false; fi
+	pip install -U pip wheel
+	pip install -Ur requirements/dev.txt
+	pip freeze
 	cp cc_licenses/settings/local.example.py cc_licenses/settings/local.py
 	echo "DJANGO_SETTINGS_MODULE=cc_licenses.settings.local" > .env
 	createdb -E UTF-8 cc_licenses
-	$(VENV_DIR)/bin/python manage.py migrate
+	python manage.py migrate
 	if [ -e project.travis.yml ] ; then mv project.travis.yml .travis.yml; fi
 	@echo
 	@echo "The cc_licenses project is now setup on your machine."
@@ -70,7 +69,7 @@ setup:
 	@echo "	python manage.py runserver"
 
 update:
-	$(VENV_DIR)/bin/pip install -U -r requirements/dev.txt
+	pip install -U -r requirements/dev.txt
 
 # Build documentation
 docs:

README.rst

@@ -12,7 +12,7 @@ Below you will find basic setup and deployment instructions for the cc_licenses
 project. To begin you should have the following applications installed on your
 local development system:
 
-- Python >= 3.8
+- Python >= 3.7
 - NodeJS >= 10.16
 - `pip <http://www.pip-installer.org/>`_ >= 20
 - `virtualenv <http://www.virtualenv.org/>`_ >= 1.10
@@ -51,9 +51,9 @@ adjustments as necessary to your needs.
 To setup your local environment you should create a virtualenv and install the
 necessary requirements::
 
-    # Check that you have python3.8 installed
-    $ which python3.8
-    $ mkvirtualenv cc_licenses -p `which python3.8`
+    # Check that you have python3.7 installed
+    $ which python3.7
+    $ mkvirtualenv cc_licenses -p `which python3.7`
     (cc_licenses)$ pip install -r requirements/dev.txt
 
 Next, we'll set up our local environment variables. We use `django-dotenv

cc_licenses/settings/deploy.py

@@ -14,11 +14,6 @@
 
 DEBUG = False
 
-
-if 'MEDIA_ROOT' in os.environ:
-    MEDIA_ROOT = os.getenv('MEDIA_ROOT')
-
-
 if 'DATABASE_URL' in os.environ:
     # Dokku
     SECRET_KEY = os.environ['DJANGO_SECRET_KEY']
@@ -50,7 +45,6 @@
     # https://warehouse.python.org/project/whitenoise/
     STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
 
-    WEBSERVER_ROOT = os.path.join(PROJECT_ROOT, 'www')
 else:
     SECRET_KEY = os.environ['SECRET_KEY']
 
@@ -60,13 +54,10 @@
     DATABASES['default']['PORT'] = os.environ.get('DB_PORT', '')
     DATABASES['default']['PASSWORD'] = os.environ.get('DB_PASSWORD', '')
 
-    WEBSERVER_ROOT = '/var/www/cc_licenses/'
-
-PUBLIC_ROOT = os.path.join(WEBSERVER_ROOT, 'public')
 
-STATIC_ROOT = os.path.join(PUBLIC_ROOT, 'static')
+STATIC_ROOT = os.getenv('STATIC_ROOT', os.path.join(ROOT_DIR, 'static'))
 
-MEDIA_ROOT = os.path.join(PUBLIC_ROOT, 'media')
+MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(ROOT_DIR, 'media'))
 
 CACHES = {
     'default': {
@@ -89,8 +80,8 @@
 else:
     default_smtp_port = 25
 EMAIL_PORT = os.environ.get('EMAIL_PORT', default_smtp_port)
-EMAIL_SUBJECT_PREFIX = '[CC-Licenses %s] ' % ENVIRONMENT.title()
-DEFAULT_FROM_EMAIL = 'noreply@%(DOMAIN)s' % os.environ
+EMAIL_SUBJECT_PREFIX = os.getenv("EMAIL_SUBJECT_PREFIX", '[CC-Licenses %s] ' % ENVIRONMENT.title())
+DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL", 'noreply@%(DOMAIN)s' % os.environ)
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
 
 CSRF_COOKIE_SECURE = True