diff --git a/.travis.yml b/.travis.yml index cd2093c55a..124ed02da0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ addons: before_install: - make setup - - make setup_ci script: - make coverage diff --git a/Makefile b/Makefile index dadbb44999..77a38f02f3 100644 --- a/Makefile +++ b/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 diff --git a/requirements/base.txt b/requirements.txt similarity index 81% rename from requirements/base.txt rename to requirements.txt index f8be0063f8..6cf3834241 100644 --- a/requirements/base.txt +++ b/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 \ No newline at end of file diff --git a/requirements/build.txt b/requirements/build.txt deleted file mode 100644 index 9ec2467668..0000000000 --- a/requirements/build.txt +++ /dev/null @@ -1,4 +0,0 @@ --r base.txt -flake8==3.3.0 -coverage>=4.5.3 -python-coveralls==2.9.1 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt deleted file mode 100644 index 3ec7263b93..0000000000 --- a/requirements/dev.txt +++ /dev/null @@ -1,4 +0,0 @@ --r build.txt -django-extensions==1.7.8 -graphviz==0.6 -ipython==5.3.0