Optimize requirements (#35)

CONTRIBUTING.rst

@@ -36,7 +36,7 @@ You want to contribute some code? Great! Here are a few steps to get you started
       $ virtualenv venv
       $ source venv/bin/activate
       (venv) $ pip install -e .[validation]
-      (venv) $ pip install -rrequirements/dev.txt -rrequirements/test.txt "Django>=1.11.7"
+      (venv) $ pip install -rrequirements/dev.txt "Django>=1.11.7"
 
 #. **Make your changes and check them against the test project**
 

requirements/ci.txt

@@ -1,4 +1,5 @@
-# requirements for CI test suite
--r dev.txt
+# requirements for the CI test runner
 tox-travis>=0.10
 codecov>=2.0.9
+
+-r tox.txt

requirements/dev.txt

@@ -1,7 +1,4 @@
-# requirements for local development
-tox>=2.9.1
-tox-battery>=0.5
-detox>=0.11
-
+# requirements for local development to be installed via pip install -r requirements/dev.txt
+-r tox.txt
+-r test.txt
 -r lint.txt
--r setup.txt

requirements/docs.txt

@@ -1,7 +1,8 @@
-Sphinx==1.6.5
-sphinx_rtd_theme==0.2.4
-Pillow==4.3.0
-readme_renderer==17.2
+# used by the 'docs' tox env for building the documentation
+Sphinx>=1.6.5
+sphinx_rtd_theme>=0.2.4
+Pillow>=4.3.0
+readme_renderer>=17.2
 
-Django==2.0
+Django>=2.0,<2.1
 djangorestframework_camel_case>=0.2.0

requirements/lint.txt

@@ -1,3 +1,4 @@
+# used by the 'lint' tox env for linting via flake8
 isort>=4.2
 flake8>=3.5.0
 flake8-isort>=2.3

requirements/setup.txt

@@ -1,4 +1,4 @@
-# requirements for building the distributable package
+# needed to build the package setup_requires in setup.py
 
 # do not unpin this (see setup.py)
 setuptools_scm==1.15.6

requirements/test.txt

@@ -1,4 +1,4 @@
-# pytest runner + plugins
+# requirements for running the tests via pytest
 pytest>=2.9
 pytest-pythonpath>=0.7.1
 pytest-cov>=2.5.1

requirements/tox.txt

@@ -0,0 +1,6 @@
+# requirements for building and running tox
+tox>=2.9.1
+tox-battery>=0.5
+detox>=0.11
+
+-r setup.txt

setup.py

@@ -9,7 +9,7 @@ from setuptools import find_packages, setup
 
 def read_req(req_file):
     with open(os.path.join('requirements', req_file)) as req:
-        return [line for line in req.readlines() if line and not line.isspace()]
+        return [line.strip() for line in req.readlines() if line.strip() and not line.strip().startswith('#')]
 
 
 with io.open('README.rst', encoding='utf-8') as readme:

tox.ini

@@ -25,7 +25,6 @@ deps =
     drfmaster: https://github.com/django/django/archive/master.tar.gz
 
     # other dependencies
-    -rrequirements/base.txt
     -rrequirements/validation.txt
     -rrequirements/test.txt