Merge branch '160-postgres-ci' into 'master'

Configured CI to use postgres

Closes #160 

Ugly hack in .gitlab-ci.yml and tox.ini is ugly but tox doesn't do conditional dependencies

See merge request !194

.gitlab-ci.yml

+variables:
+  POSTGRES_DB: thalia
+  POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: ""
+  CI_DEPS: psycopg2
+
+services:
+  - postgres:latest
+
 pep8:
   image: python:3.4
   before_script:

ci-requirements.txt

+psycopg2

tox.ini

@@ -9,7 +9,11 @@ commands =
     python manage.py templatecheck --project-only
     python manage.py makemigrations --no-input --check --dry-run
     python -Wall manage.py test
-deps = -r{toxinidir}/requirements.txt
+deps = 
+    -r{toxinidir}/requirements.txt
+    {env:CI_DEPS:}
+
+passenv = GITLAB_CI
 
 [flake8]
 exclude = */migrations/*, */urls.py, .ropeproject

website/thaliawebsite/settings/__init__.py

@@ -8,3 +8,5 @@ except ImportError:
 
 if os.environ.get('DJANGO_PRODUCTION'):
     from .production import *
+if os.environ.get('GITLAB_CI'):
+    from .testing import *

website/thaliawebsite/settings/settings.py

@@ -110,7 +110,6 @@ WSGI_APPLICATION = 'thaliawebsite.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/dev/ref/settings/#databases
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',

website/thaliawebsite/settings/testing.py

+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'thalia',
+        'USER': 'postgres',
+        'PASSWORD': '',
+        'HOST': 'postgres',
+        'PORT': 5432,
+    },
+}