Skip to content

Commit ca3536c

Browse files
edmorleyadamchainz
authored andcommitted
Test against Django 1.11 but allow failures (adamchainz#198)
Since tests are currently failing (see adamchainz#197). The `>=1.11a1,<2.0` specifier will avoid having to adjust the version as the Django 1.11 pre-release cycle continues. Django 1.11 now requires pytz, so this has to be pinned due to the use of `--no-deps` in the Tox pip install command.
1 parent e91a20a commit ca3536c

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

requirements.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ multilint
55
pytest
66
pytest-cov
77
pytest-django
8+
pytz
89
Pygments

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ Pygments==2.1.3
1919
pytest-cov==2.4.0
2020
pytest-django==3.1.2
2121
pytest==3.0.5
22+
pytz==2016.10

tox.ini

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
py{27,35}-codestyle,
4-
py{27,35}-django{18,19,110}
4+
py{27,35}-django{18,19,110,111}
55

66
[testenv]
77
setenv =
@@ -12,8 +12,17 @@ deps =
1212
django18: Django>=1.8,<1.9
1313
django19: Django>=1.9,<1.10
1414
django110: Django>=1.10,<1.11
15+
django111: Django>=1.11a1,<2.0
1516
commands = ./runtests.py {posargs}
1617

18+
# Tests currently fail under Django 1.11:
19+
# https://github.com/ottoyiu/django-cors-headers/issues/197
20+
[testenv:py27-django111]
21+
ignore_outcome = True
22+
23+
[testenv:py35-django111]
24+
ignore_outcome = True
25+
1726
[testenv:py27-codestyle]
1827
commands = multilint
1928

0 commit comments

Comments
 (0)