Update requirement setup

Author: jpadilla

requirements.txt

@@ -1,15 +1,9 @@
-# Minimum Django and DRF version
-Django>=1.6
-djangorestframework>=2.4.3
+# Laying these out as seperate requirements files, allows us to
+# only included the relevent sets when running tox, and ensures
+# we are only ever declaring out dependancies in one place.
 
-# Test requirements
-pytest-django==2.6
-pytest==2.5.2
-pytest-cov==1.6
-flake8==2.2.2
-freezegun==0.3.2
-
-# Optional packages
-django-oauth-plus>=2.2.1
-oauth2>=1.5.211
-django-oauth2-provider>=0.2.4
+-r requirements/optionals.txt
+-r requirements/testing.txt
+-r requirements/documentation.txt
+-r requirements/codestyle.txt
+-r requirements/packaging.txt

requirements/codestyle.txt

@@ -0,0 +1,3 @@
+# PEP8 code linting, which we run on all commits.
+flake8==2.4.0
+pep8==1.5.7

requirements/documentation.txt

@@ -0,0 +1,2 @@
+# MkDocs to build our documentation.
+mkdocs==0.13.2

requirements/optionals.txt

@@ -0,0 +1,3 @@
+oauth2==1.5.211
+django-oauth-plus==2.2.6
+django-oauth2-provider==0.2.6.1

requirements/packaging.txt

@@ -0,0 +1,5 @@
+# Wheel for PyPI installs.
+wheel==0.24.0
+
+# Twine for secured PyPI uploads.
+twine==1.4.0

requirements/testing.txt

@@ -0,0 +1,7 @@
+# PyTest for running the tests.
+pytest==2.6.4
+pytest-django==2.8.0
+pytest-cov==1.6
+
+# Mocking the datetime module.
+freezegun==0.3.2

tox.ini

@@ -9,26 +9,24 @@ commands = ./runtests.py --fast {posargs}
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django1.6: Django==1.6.11
-       django1.7: Django==1.7.8
-       django1.8: Django==1.8.1
-       drf2.4: djangorestframework==2.4.5
-       drf3.0: djangorestframework==3.0.5
-       drf3.1: djangorestframework==3.1.2
-       py27-django1.6-drf{2.4,3.0,3.1}: oauth2==1.5.211
-       py27-django1.6-drf{2.4,3.0,3.1}: django-oauth-plus==2.2.6
-       py27-django1.6-drf{2.4,3.0,3.1}: django-oauth2-provider==0.2.6.1
-       pytest-django==2.8.0
-       py27-django{1.6,1.7,1.8}-drf3.1.1: djangorestframework-oauth==1.0.1
-       freezegun==0.3.3
+       django1.6: Django==1.6.3  # Should track minimum supported
+       django1.7: Django==1.7.8  # Should track maximum supported
+       django1.8: Django==1.8.2  # Should track maximum supported
+       drf2.4: djangorestframework==2.4.5  # Should track minimum supported
+       drf3.0: djangorestframework==3.0.5  # Should track maximum supported
+       drf3.1: djangorestframework==3.1.3  # Should track maximum supported
+       py27-django1.6-drf{2.4,3.0,3.1}: -rrequirements/optionals.txt
+       py27-django{1.6,1.7,1.8}-drf3.1: djangorestframework-oauth==1.0.1
+       -rrequirements/testing.txt
 
 [testenv:py27-flake8]
 commands = ./runtests.py --lintonly
 deps =
-       pytest==2.5.2
-       flake8==2.2.2
+       -rrequirements/codestyle.txt
+       -rrequirements/testing.txt
 
 [testenv:py27-docs]
 commands = mkdocs build
 deps =
-       mkdocs>=0.11.1
+       -rrequirements/testing.txt
+       -rrequirements/documentation.txt