Merge branch 'faster-build' into 'master'

Speed up CI

See merge request !641

.gitlab-ci.yml

@@ -3,12 +3,18 @@ variables:
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: ""
   CI_DEPS: psycopg2
+  # https://hub.docker.com/r/twiggers/python-thalia/
+  # https://github.com/thomwiggers/python-thalia
+  # Should get auto-updated with the official 'python' repository
+  # Installs:
+  #  - pip: tox, coverage
+  #  - apt: ghostscript
+  PY35_IMAGE: twiggers/python-thalia:3.5
+  PIP_CACHE_DIR: "${CI_PROJECT_DIR}/pip-cache"
 
 pep8:
-  image: python:3.5
+  image: $PY35_IMAGE
   before_script:
-    - export PIP_CACHE_DIR="pip-cache"
-    - pip install tox
   script:
     - tox -e flake8
 
@@ -16,12 +22,7 @@ pep8:
   services:
     - postgres:latest
   before_script:
-    - export PIP_CACHE_DIR="pip-cache"
-    - mkdir -p pip-cache
     - git log -1
-    - pip install tox coverage
-    - apt-get update
-    - apt-get install -y ghostscript  # required for Thabloid's tests
   script:
     - tox -e ${PYTHON_VERSION}-${DJANGO_VERSION}
     - cd website
@@ -29,13 +30,13 @@ pep8:
 
 python35-django11:
   <<: *djangotest
-  image: python:3.5
+  image: $PY35_IMAGE
   variables:
     PYTHON_VERSION: py35
     DJANGO_VERSION: django11
 
 docs:
-  image: python:3.5
+  image: $PY35_IMAGE
   before_script:
     # install django deps
     - pip install -r requirements.txt
@@ -49,6 +50,6 @@ docs:
 cache:
   key: "$CI_JOB_NAME"
   paths:
-    - pip-cache
+    - "${PIP_CACHE_DIR}"
 
 # vim: set sw=2 ts=2 et :

tox.ini

@@ -22,7 +22,9 @@ deps =
     django11: django>=1.11b1,<1.12
     {env:CI_DEPS:}
 
-passenv = GITLAB_CI
+passenv =
+    GITLAB_CI
+    PIP_CACHE_DIR
 whitelist_externals=
     sed
     cp
@@ -35,3 +37,5 @@ deps= flake8
 skip_install=True
 commands=
     flake8 .
+passenv =
+    PIP_CACHE_DIR