Skip to content

Commit 69ca1a5

Browse files
committed
Fixed targetting Django 1.10 in test config files
Simply writing Django<1.11.0 may run with an older pre-installed Django.
1 parent fa106f6 commit 69ca1a5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ python:
99
env:
1010
- DJANGO="Django>=1.8.0,<1.9.0"
1111
- DJANGO="Django>=1.9.0,<1.10.0"
12-
- DJANGO="Django<1.11.0"
12+
- DJANGO="Django>=1.10a,<1.11.0"
1313
matrix:
1414
exclude:
1515
- python: "3.2"
1616
env: DJANGO="Django>=1.9.0,<1.10.0"
1717
- python: "3.3"
1818
env: DJANGO="Django>=1.9.0,<1.10.0"
1919
- python: "3.2"
20-
env: DJANGO="Django<1.11.0"
20+
env: DJANGO="Django>=1.10a,<1.11.0"
2121
- python: "3.3"
22-
env: DJANGO="Django<1.11.0"
22+
env: DJANGO="Django>=1.10a,<1.11.0"
2323
- python: "3.5"
2424
env: DJANGO="Django>=1.8.0,<1.9.0"
2525
install:
26-
- pip install -e .
27-
- travis_retry pip install django-discover-runner sqlparse
26+
- travis_retry pip install sqlparse
2827
- travis_retry pip install --pre $DJANGO
28+
- pip install -e .
2929
script:
3030
- make jshint
3131
- make test

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ commands = make test
1616
deps =
1717
django18: Django>=1.8,<1.9
1818
django19: Django>=1.9,<1.10
19-
django110: Django<1.11
20-
django-discover-runner
19+
django110: Django>=1.10a,<1.11
2120
selenium
2221
sqlparse
2322
setenv =
2423
PYTHONPATH = {toxinidir}
2524
whitelist_externals = make
25+
pip_pre=True
2626

2727
[testenv:flake8]
2828
basepython =

0 commit comments

Comments
 (0)