Commit fdd04ad7 authored by Daniel Klaffenbach's avatar Daniel Klaffenbach 🐍

CI: Update tests for Django 2.0

parent 14e04f41
Pipeline #13232 passed with stage
in 40 seconds
...@@ -30,3 +30,7 @@ py36-django111: ...@@ -30,3 +30,7 @@ py36-django111:
stage: test stage: test
script: $HOME/tox/bin/tox -e 'py36-django111' script: $HOME/tox/bin/tox -e 'py36-django111'
py36-django20:
stage: test
script: $HOME/tox/bin/tox -e 'py36-django20'
...@@ -26,18 +26,18 @@ INSTALLED_APPS = ( ...@@ -26,18 +26,18 @@ INSTALLED_APPS = (
'tests' 'tests'
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.RemoteUserMiddleware', 'django.contrib.auth.middleware.RemoteUserMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
) )
# compat for Django 1.8
MIDDLEWARE_CLASSES = MIDDLEWARE
ROOT_URLCONF = 'tests.urls' ROOT_URLCONF = 'tests.urls'
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import include, url from django.conf.urls import url
from django.contrib import admin from django.contrib import admin
urlpatterns = [ urlpatterns = [
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', admin.site.urls)
] ]
\ No newline at end of file
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
[tox] [tox]
skipsdist = true skipsdist = true
envlist = py{27,36}-django{18,110,111} envlist = py{27,36}-django{18,110,111},
py{36}-django{20}
[testenv] [testenv]
#alwayscopy = True #alwayscopy = True
...@@ -21,6 +23,7 @@ deps = ...@@ -21,6 +23,7 @@ deps =
django18: Django >= 1.8, < 1.9 django18: Django >= 1.8, < 1.9
django110: Django >= 1.10, < 1.11 django110: Django >= 1.10, < 1.11
django111: Django >= 1.11, < 2 django111: Django >= 1.11, < 2
django20: Django >= 2, < 2.1
setenv = setenv =
DJANGO_LIVE_TEST_SERVER_ADDRESS=localhost:9000-9200 DJANGO_LIVE_TEST_SERVER_ADDRESS=localhost:9000-9200
......
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