Re-structured requirements files

2015-10-18 19:47:16 +02:00
parent e0f75d435e
commit f7011abfd4
4 changed files with 13 additions and 18 deletions
--- a/src/requirements.txt
+++ b/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
--- a/src/requirements/dev.txt
+++ b/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
--- a/src/requirements/testing.txt
+++ b/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