Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ matrix:
python: 3.6
- env: TOXENV=py34-django20
python: 3.4
- env: TOXENV=py35-django20
- env: TOXENV=py35-django21
python: 3.5
- env: TOXENV=py36-django20
- env: TOXENV=py36-django21
python: 3.6

branches:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
six
djangorestframework>=3.3,<3.9
djangorestframework>=3.9,<3.10
3 changes: 1 addition & 2 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
TEST_PERFORMANCE = False

DEBUG = True
TEMPLATE_DEBUG = DEBUG

DATABASES = {
'default': {
Expand Down Expand Up @@ -55,6 +54,7 @@
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
'debug': DEBUG,
},
},
]
Expand All @@ -72,7 +72,6 @@
STATIC_ROOT = '%s/static/' % SITE_ROOT
STATIC_URL = '/static/'

TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'

# local settings must be imported before test runner otherwise they'll be ignored
try:
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
envlist =
py{27,34,35,36,py,py3}-django111{,-pytest}
py{34,35,36,py3}-django20{,-pytest}
py{35,36,py3}-django21{,-pytest}

[testenv]
usedevelop = true
Expand All @@ -17,6 +18,7 @@ commands =
deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
-rrequirements-test.txt
pytest: pytest
pytest: pytest-django