Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
4ae90c69
Commit
4ae90c69
authored
Aug 31, 2018
by
Sébastiaan Versteeg
Browse files
Merge branch 'test-on-py36-py37' into 'master'
No longer test on python 3.5 See merge request
!924
parents
c336a934
fa3e2894
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
4ae90c69
...
...
@@ -8,8 +8,8 @@ variables:
# Installs:
# - pip: tox, coverage, pipenv
# - apt: ghostscript
PY35_IMAGE
:
thalia/python-thalia:3.5
PY36_IMAGE
:
thalia/python-thalia:3.6
PY37_IMAGE
:
thalia/python-thalia:3.7
PIP_CACHE_DIR
:
"
${CI_PROJECT_DIR}/pip-cache"
stages
:
...
...
@@ -18,7 +18,7 @@ stages:
pep8
:
stage
:
test
image
:
$PY3
5
_IMAGE
image
:
$PY3
6
_IMAGE
script
:
-
tox -e flake8
...
...
@@ -33,23 +33,23 @@ pep8:
-
cd website
-
coverage report
python3
5
-django20
:
python3
6
-django20
:
<<
:
*djangotest
image
:
$PY3
5
_IMAGE
image
:
$PY3
6
_IMAGE
variables
:
PYTHON_VERSION
:
py3
5
PYTHON_VERSION
:
py3
6
DJANGO_VERSION
:
django20
python3
6
-django20
:
python3
7
-django20
:
<<
:
*djangotest
image
:
$PY3
6
_IMAGE
image
:
$PY3
7
_IMAGE
variables
:
PYTHON_VERSION
:
py3
6
PYTHON_VERSION
:
py3
7
DJANGO_VERSION
:
django20
docs
:
stage
:
test
image
:
$PY3
5
_IMAGE
image
:
$PY3
6
_IMAGE
before_script
:
# install django deps
-
pipenv --bare install --dev --ignore-pipfile
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment