Skip to content

Commit 6960c96

Browse files
Updated readme, requirements and tests
1 parent bfd20ea commit 6960c96

File tree

8 files changed

+90
-41
lines changed

8 files changed

+90
-41
lines changed

.travis.yml

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,58 @@
11
language: python
2-
python: "2.7"
3-
env:
4-
- TOX_ENV=py27-django15
5-
- TOX_ENV=py27-django16
6-
- TOX_ENV=py27-django17
7-
- TOX_ENV=py27-django18
8-
- TOX_ENV=py33-django15
9-
- TOX_ENV=py33-django16
10-
- TOX_ENV=py33-django17
11-
- TOX_ENV=py33-django18
12-
- TOX_ENV=py34-django15
13-
- TOX_ENV=py34-django16
14-
- TOX_ENV=py34-django17
15-
- TOX_ENV=py34-django18
2+
matrix:
3+
include:
4+
- python: "2.7"
5+
env: TOX_ENV=py27-django18
6+
- python: "3.2"
7+
env: TOX_ENV=py32-django18
8+
- python: "3.3"
9+
env: TOX_ENV=py33-django18
10+
- python: "3.4"
11+
env: TOX_ENV=py34-django18
12+
- python: "3.5"
13+
env: TOX_ENV=py35-django18
14+
15+
- python: "2.7"
16+
env: TOX_ENV=py27-django19
17+
- python: "3.4"
18+
env: TOX_ENV=py34-django19
19+
- python: "3.5"
20+
env: TOX_ENV=py35-django19
21+
22+
- python: "2.7"
23+
env: TOX_ENV=py27-django110
24+
- python: "3.4"
25+
env: TOX_ENV=py34-django110
26+
- python: "3.5"
27+
env: TOX_ENV=py35-django110
28+
29+
- python: "2.7"
30+
env: TOX_ENV=py27-django111
31+
- python: "3.4"
32+
env: TOX_ENV=py34-django111
33+
- python: "3.5"
34+
env: TOX_ENV=py35-django111
35+
- python: "3.6"
36+
env: TOX_ENV=py36-django111
37+
38+
- python: "3.4"
39+
env: TOX_ENV=py34-django20
40+
- python: "3.5"
41+
env: TOX_ENV=py35-django20
42+
- python: "3.6"
43+
env: TOX_ENV=py36-django20
44+
- python: "3.7-dev"
45+
env: TOX_ENV=py37-django20
46+
47+
- python: "3.5"
48+
env: TOX_ENV=py35-django21
49+
- python: "3.6"
50+
env: TOX_ENV=py36-django21
51+
- python: "3.7-dev"
52+
env: TOX_ENV=py37-django21
1653
install:
1754
- pip install tox
55+
- if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install virtualenv==15.2.0; fi
56+
- if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then pip install virtualenv==13.1.2; fi
1857
script:
1958
- tox -e $TOX_ENV

README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ Current features
2727
Requirements
2828
------------
2929

30-
django-model-utils 2.0.3
30+
django-model-utils
3131

32-
It was developed using Django 1.6.5
3332

3433
Installation
3534
------------

quiz/tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
from django.contrib.auth.models import User, Permission
66
from django.core.exceptions import ValidationError
77
from django.core.files.base import ContentFile
8-
from django.core.urlresolvers import resolve
8+
try:
9+
from django.core.urlresolvers import resolve
10+
except ImportError:
11+
from django.urls import resolve
912
from django.http import HttpRequest
1013
from django.template import Template, Context
1114
from django.test import TestCase

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
django>=1.11.3
1+
django>=1.8.19
22
django-model-utils>=3.1.1
33
Pillow>=4.0.0
44

runtests.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212

1313

1414
def runtests():
15-
if django.VERSION >= (1, 7):
16-
django.setup()
15+
django.setup()
1716
TestRunner = get_runner(settings)
1817
test_runner = TestRunner(verbosity=1, interactive=True)
1918
failures = test_runner.run_tests(

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
],
3030
install_requires=[
3131
'django-model-utils>=3.1.1',
32-
'Django>=1.11.3',
32+
'Django>=1.8.19',
3333
'Pillow>=4.0.0'
3434
],
3535
test_suite='runtests.runtests'

test_settings.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import django
12

23
DEBUG = True
34
DEBUG_PROPAGATE_EXCEPTIONS = True
@@ -81,13 +82,22 @@
8182
},
8283
]
8384

84-
MIDDLEWARE_CLASSES = (
85-
'django.middleware.common.CommonMiddleware',
86-
'django.contrib.sessions.middleware.SessionMiddleware',
87-
'django.middleware.csrf.CsrfViewMiddleware',
88-
'django.contrib.auth.middleware.AuthenticationMiddleware',
89-
'django.contrib.messages.middleware.MessageMiddleware',
90-
)
85+
if django.VERSION >= (1, 10):
86+
MIDDLEWARE = (
87+
'django.middleware.common.CommonMiddleware',
88+
'django.contrib.sessions.middleware.SessionMiddleware',
89+
'django.middleware.csrf.CsrfViewMiddleware',
90+
'django.contrib.auth.middleware.AuthenticationMiddleware',
91+
'django.contrib.messages.middleware.MessageMiddleware',
92+
)
93+
else:
94+
MIDDLEWARE_CLASSES = (
95+
'django.middleware.common.CommonMiddleware',
96+
'django.contrib.sessions.middleware.SessionMiddleware',
97+
'django.middleware.csrf.CsrfViewMiddleware',
98+
'django.contrib.auth.middleware.AuthenticationMiddleware',
99+
'django.contrib.messages.middleware.MessageMiddleware',
100+
)
91101

92102
ROOT_URLCONF = 'quiz.urls'
93103

@@ -126,8 +136,3 @@
126136
)
127137

128138
AUTH_USER_MODEL = 'auth.User'
129-
130-
import django
131-
132-
if django.VERSION < (1, 3):
133-
INSTALLED_APPS += ('staticfiles',)

tox.ini

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
[tox]
22
envlist =
3-
{py27,py33,py34}-django15,
4-
{py27,py33,py34}-django16,
5-
{py27,py33,py34}-django17,
6-
{py27,py33,py34}-django18
3+
{py27,py32,py33,py34,py35}-django18,
4+
{py27,py34,py35}-django19,
5+
{py27,py34,py35}-django110,
6+
{py27,py34,py35,py36}-django111,
7+
{py34,py35,py36,py37}-django20
8+
{py35,py36,py37}-django21
79

810
[testenv]
911
commands = python setup.py test
1012
deps =
11-
django15: Django==1.5.11
12-
django16: Django==1.6.8
13-
django17: Django==1.7.1
14-
django18: Django==1.8.2
13+
django18: Django==1.8.19
14+
django19: Django==1.9.13
15+
django110: Django==1.10.8
16+
django111: Django==1.11.15
17+
django20: Django==2.0.8
18+
django21: Django==2.1
1519
django-model-utils
1620
Pillow
1721

0 commit comments

Comments
 (0)