Updated requirements

synasius · synasius · commit 75a8f4651c12 · 2013-09-17T08:56:31.000+02:00
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,4 +1,3 @@
-Django>=1.4
 Sphinx==1.2b1
 South==0.8.2
 oauthlib==0.6.0
diff --git a/requirements/optional.txt b/requirements/optional.txt
@@ -1,2 +1,2 @@
 -r base.txt
-djangorestframework==2.3.6
+djangorestframework>=2.3
diff --git a/requirements/project.txt b/requirements/project.txt
@@ -0,0 +1,2 @@
+-r base.txt
+Django>=1.4
diff --git a/tox.ini b/tox.ini
@@ -5,40 +5,34 @@ envlist = py27-django14,py27-django15,py33-django15,py27-django16,py33-django16
 downloadcache = {toxworkdir}/cache/
 commands={envpython} runtests.py
 deps =
-    Sphinx==1.2b1
-    South==0.8.2
-    oauthlib==0.6.0
-    six==1.3.0
-    django-braces==1.2.2
-    coverage==3.6
-    djangorestframework==2.3.6
+    -r{toxinidir}/requirements/optional.txt
 
 [testenv:py27-django14]
 basepython = python2.7
 deps =
-    Django==1.4.6
+    Django==1.4.8
     {[testenv]deps}
 
 [testenv:py27-django15]
 basepython = python2.7
 deps =
-    Django==1.5.2
+    Django==1.5.4
     {[testenv]deps}
 
 [testenv:py33-django15]
 basepython = python3.3
 deps =
-    Django==1.5.2
+    Django==1.5.4
     {[testenv]deps}
 
 [testenv:py27-django16]
 basepython = python2.7
 deps =
-    https://www.djangoproject.com/download/1.6b3/tarball/
+    https://www.djangoproject.com/download/1.6b4/tarball/
     {[testenv]deps}
 
 [testenv:py33-django16]
 basepython = python3.3
 deps =
-    https://www.djangoproject.com/download/1.6b3/tarball/
+    https://www.djangoproject.com/download/1.6b4/tarball/
     {[testenv]deps}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-Django>=1.4`
`2`	`1`	`Sphinx==1.2b1`
`3`	`2`	`South==0.8.2`
`4`	`3`	`oauthlib==0.6.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`-r base.txt`
`2`		`-djangorestframework==2.3.6`
	`2`	`+djangorestframework>=2.3`