Skip to content

Commit

Permalink
Update test runner to use Django 1.11 (#211)
Browse files Browse the repository at this point in the history
* Update test runner to use Django 1.11

* Update test.txt

Add six to test dependencies because pytest-pythonpath fails without it

* Remove Django 1.9
  • Loading branch information
andreyrusanov authored and mmarcos committed Jun 2, 2017
1 parent dbbff74 commit f7904c3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
setuptools
django-extra-views==0.9.0
django-filter==1.0.4
django-widget-tweaks==1.4.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-e .
-r test.txt
pypandoc==1.4
django>=1.8.12,<1.11
django>=1.8.12,<1.12
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{27,35,36}-django{18,19,110}
envlist = py{27,35,36}-django{18,110,111}
python: 3.6

[tox:travis]
Expand All @@ -11,8 +11,8 @@ python: 3.6
deps =
-efile://{toxinidir}
-rrequirements/test.txt
django111: Django >= 1.11, < 1.12
django110: Django >= 1.10, < 1.11
django19: Django >= 1.9, < 1.10
django18: Django >= 1.8, < 1.9
commands =
py.test
Expand Down

0 comments on commit f7904c3

Please sign in to comment.