Merge pull request #152 from SchrodingersGat/requirements

Cleanup requirements file

.travis.yml

@@ -10,7 +10,6 @@ addons:
 
 before_install:
     - make setup
-    - make setup_ci
 
 script:
     - make coverage

Makefile

@@ -23,16 +23,13 @@ migrate:
 	python InvenTree/manage.py check
 
 install:
-	pip install -U -r requirements/base.txt
+	pip install -U -r requirements.txt
 	
 	# Generate a secret key
 	python InvenTree/key.py
 
 setup: install migrate
 
-setup_ci:
-	pip install -U -r requirements/build.txt
-
 coverage:
 	python InvenTree/manage.py check
 	coverage run InvenTree/manage.py test build company part stock

requirements.txt

@@ -10,3 +10,6 @@ django-crispy-forms>=1.7.2
 django-import-export>=1.0.0
 django-cleanup>=2.1.0
 django-qr-code==1.0.0
+flake8==3.3.0
+coverage>=4.5.3
+python-coveralls==2.9.1

requirements/build.txt

@@ -1,4 +0,0 @@
--r base.txt
-flake8==3.3.0
-coverage>=4.5.3
-python-coveralls==2.9.1

requirements/dev.txt

@@ -1,4 +0,0 @@
--r build.txt
-django-extensions==1.7.8
-graphviz==0.6
-ipython==5.3.0