Merge pull request #3765 from linovia/feature/fix_guardian_for_dj_19

Update the Django-guardian version for Django 1.9
encode · Dec 21, 2015 · 503687d · 503687d
2 parents ce77ed8 + c5003e8
commit 503687d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
@@ -1,4 +1,4 @@
 # Optional packages which may be used with REST framework.
 markdown==2.5.2
-django-guardian==1.3.0
+django-guardian==1.3.2
 django-filter==0.10.0
diff --git a/tox.ini b/tox.ini
@@ -30,24 +30,3 @@ deps =
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-documentation.txt
 
-# Specify explicitly to exclude Django Guardian against Django 1.9
-[testenv:py27-django19]
-deps =
-        Django==1.9
-        -rrequirements/requirements-testing.txt
-        markdown==2.5.2
-        django-filter==0.10.0
-
-[testenv:py34-django19]
-deps =
-        Django==1.9
-        -rrequirements/requirements-testing.txt
-        markdown==2.5.2
-        django-filter==0.10.0
-
-[testenv:py35-django19]
-deps =
-        Django==1.9
-        -rrequirements/requirements-testing.txt
-        markdown==2.5.2
-        django-filter==0.10.0