Skip to content

Commit 503687d

Browse files
committed
Merge pull request #3765 from linovia/feature/fix_guardian_for_dj_19
Update the Django-guardian version for Django 1.9
2 parents ce77ed8 + c5003e8 commit 503687d

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Optional packages which may be used with REST framework.
22
markdown==2.5.2
3-
django-guardian==1.3.0
3+
django-guardian==1.3.2
44
django-filter==0.10.0

tox.ini

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,3 @@ deps =
3030
-rrequirements/requirements-testing.txt
3131
-rrequirements/requirements-documentation.txt
3232

33-
# Specify explicitly to exclude Django Guardian against Django 1.9
34-
[testenv:py27-django19]
35-
deps =
36-
Django==1.9
37-
-rrequirements/requirements-testing.txt
38-
markdown==2.5.2
39-
django-filter==0.10.0
40-
41-
[testenv:py34-django19]
42-
deps =
43-
Django==1.9
44-
-rrequirements/requirements-testing.txt
45-
markdown==2.5.2
46-
django-filter==0.10.0
47-
48-
[testenv:py35-django19]
49-
deps =
50-
Django==1.9
51-
-rrequirements/requirements-testing.txt
52-
markdown==2.5.2
53-
django-filter==0.10.0

0 commit comments

Comments
 (0)