Skip to content

Commit

Permalink
Merge pull request #3427 from carltongibson/exlude-guardian
Browse files Browse the repository at this point in the history
Exclude Guardian testing against Django master
  • Loading branch information
tomchristie committed Sep 22, 2015
2 parents 5b2b675 + 524a28c commit eccf7cc
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,25 @@ commands = mkdocs build
deps =
-rrequirements/requirements-testing.txt
-rrequirements/requirements-documentation.txt

# Specify explicitly to exclude Django Guardian against Django master (various Pythons)
[testenv:py27-djangomaster]
deps =
https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
markdown==2.5.2
django-filter==0.10.0
[testenv:py34-djangomaster]
deps =
https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
markdown==2.5.2
django-filter==0.10.0

[testenv:py35-djangomaster]
deps =
https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
markdown==2.5.2
django-filter==0.10.0

0 comments on commit eccf7cc

Please sign in to comment.