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
c5c66438
Commit
c5c66438
authored
Aug 27, 2018
by
Sébastiaan Versteeg
Browse files
Merge branch 'py36' into 'master'
Switch to Python 3.6 as runtime python See merge request
!908
parents
30b26f7f
6fb0fccf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Dockerfile
View file @
c5c66438
FROM
python:3.
5
FROM
python:3.
6
MAINTAINER
Thom Wiggers <thom@thomwiggers.nl>
LABEL
description="Contains the Thaliawebsite Django application"
...
...
tox.ini
View file @
c5c66438
[tox]
envlist
=
flake8, {
py35,
py36,py37}-django20, {
py35,
py36,py37}-django21
envlist
=
flake8, {py36,py37}-django20, {py36,py37}-django21
skipsdist
=
True
skip_missing_interpreters
=
True
...
...
@@ -26,6 +26,7 @@ env =
PIPENV_SUPPRESS_NESTED_WARNING
=
1
[testenv:flake8]
basepython
=
python36
deps
=
flake8
skip_install
=
True
commands
=
...
...
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