aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Johannes Christ <[email protected]>2018-09-16 23:29:04 +0200
committerGravatar Johannes Christ <[email protected]>2018-09-16 23:29:04 +0200
commite946b2a5a9ef7f3a85e27c4d83d9d198cabe69a8 (patch)
treec5598d3062d1cb85109305f11494dfeafc4b9c0c
parentTry omitting `pip` cache. (diff)
Re-add missing dependency.
-rw-r--r--.gitlab-ci.yml15
-rw-r--r--setup.py3
2 files changed, 12 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90185356..5a615a93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,11 @@ stages:
- test
- deploy
image: python:3.7-alpine
+variables:
+ PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
+cache:
+ paths:
+ - .cache
.test-template: &test-template
stage: test
@@ -22,7 +27,7 @@ lint:
stage: lint
before_script:
- apk add python3-dev git libpq postgresql-dev gcc cmake autoconf automake musl-dev
- - python3 -m pip install --no-cache-dir .[lint]
+ - python3 -m pip install .[lint]
script:
- flake8
tags:
@@ -33,7 +38,7 @@ test-3.7-alpine:
image: python:3.7-alpine
before_script:
- apk add python3-dev git libpq postgresql-dev gcc cmake autoconf automake musl-dev
- - python3 -m pip install --no-cache-dir .[test]
+ - python3 -m pip install .[test]
- python manage.py migrate
script:
- coverage run --source=api,home,pysite,wiki --branch manage.py test
@@ -48,7 +53,7 @@ test-3.6-alpine:
image: python:3.6-alpine
before_script:
- apk add git libpq postgresql-dev gcc cmake autoconf automake musl-dev
- - python3 -m pip install --no-cache-dir .[test]
+ - python3 -m pip install .[test]
- python manage.py migrate
test-3.7-stretch:
@@ -59,7 +64,7 @@ test-3.7-stretch:
before_script:
- apt-get update -y
- apt-get install -y git libpq-dev gcc cmake autoconf automake libc-dev
- - python3 -m pip install --no-cache-dir .[test]
+ - python3 -m pip install .[test]
- python manage.py migrate
test-3.6-stretch:
@@ -70,7 +75,7 @@ test-3.6-stretch:
before_script:
- apt-get update -y
- apt-get install -y git libpq-dev gcc cmake autoconf automake libc-dev
- - python3 -m pip install --no-cache-dir .[test]
+ - python3 -m pip install .[test]
- python manage.py migrate
pages:
diff --git a/setup.py b/setup.py
index 66b3b4d8..24c86fa1 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,8 @@ setup(
'djangorestframework>=3.8.2',
'djangorestframework-bulk>=0.2.1',
'django-hosts>=3.0',
- 'django-environ>=0.4.5'
+ 'django-environ>=0.4.5',
+ 'psycopg2-binary>=2.7.5'
],
extras_require={
'deploy': [