Skip to content

Commit

Permalink
Django 2.0 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
onrik committed Mar 21, 2018
1 parent f6ec22b commit fc17c80
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ env:
- DJANGO=1.11
- DJANGO=2.0

matrix:
exclude:
- python: "2.7"
env: DJANGO=2.0

install:
- pip install Django==$DJANGO
- pip install coveralls
Expand Down
10 changes: 10 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@
'django.middleware.clickjacking.XFrameOptionsMiddleware',
],

MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
],

ROOT_URLCONF='testurls',
DEBUG=False,
)
Expand Down
3 changes: 2 additions & 1 deletion webshell/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
VERSION = (0, 2, 4)
VERSION = (0, 2, 5)


def get_version():
return '.'.join(map(str, VERSION))


__version__ = get_version()
5 changes: 4 additions & 1 deletion webshell/tests.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# coding: utf-8
from django.test import TestCase
from django.conf import settings
from django.core.urlresolvers import reverse
from django.contrib.auth import get_user_model
try:
from django.core.urlresolvers import reverse
except ImportError:
from django.urls import reverse

from webshell.models import Script

Expand Down

0 comments on commit fc17c80

Please sign in to comment.