Commit c5c66438 authored by Sébastiaan Versteeg's avatar 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
FROM python:3.5 FROM python:3.6
MAINTAINER Thom Wiggers <thom@thomwiggers.nl> MAINTAINER Thom Wiggers <thom@thomwiggers.nl>
LABEL description="Contains the Thaliawebsite Django application" LABEL description="Contains the Thaliawebsite Django application"
......
[tox] [tox]
envlist = flake8, {py35,py36,py37}-django20, {py35,py36,py37}-django21 envlist = flake8, {py36,py37}-django20, {py36,py37}-django21
skipsdist = True skipsdist = True
skip_missing_interpreters = True skip_missing_interpreters = True
...@@ -26,6 +26,7 @@ env = ...@@ -26,6 +26,7 @@ env =
PIPENV_SUPPRESS_NESTED_WARNING=1 PIPENV_SUPPRESS_NESTED_WARNING=1
[testenv:flake8] [testenv:flake8]
basepython=python36
deps= flake8 deps= flake8
skip_install=True skip_install=True
commands= commands=
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment