Re-structured requirements files

doc/development/setup.rst

@@ -37,7 +37,7 @@ Working with the code
 The first thing you need are all the main application's dependencies::
 
     cd src/
-    pip install -r requirements.txt
+    pip install -r requirements.txt requirements/dev.txt
 
 Then, create the local database::
 

src/requirements.txt

@@ -1,6 +1,4 @@
 -r requirements/production.txt
--r requirements/dev.txt
--r requirements/testing.txt
 -r requirements/paypal.txt
 -r requirements/stripe.txt
 -r requirements/banktransfer.txt

src/requirements/dev.txt

@@ -1 +1,13 @@
 django-debug-toolbar>=1.3.0,<2.0
+# Testing requirements
+pyflakes
+pep8==1.5.7  # exact requirement by flake8 2.4.0
+pep8-naming
+flake8
+coveralls
+coverage
+selenium
+pytest
+pytest-django
+isort
+pytest-mock

src/requirements/testing.txt

@@ -1,15 +0,0 @@
-# Testing requirements
-pyflakes
-pep8==1.5.7  # exact requirement by flake8 2.4.0
-pep8-naming
-flake8
-coveralls
-coverage
-selenium
-pytest
-pytest-django
-isort
-pytest-mock
-# PyVirtualDisplay
-# -e git+https://github.com/pretix/sauceclient.git@master#egg=sauceclient
-# travis