Remove run_tests.py, use make *

codefortulsa · Aug 22, 2014 · bd68725 · bd68725
1 parent c7099b9
commit bd68725
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ language: python
 addons:
     postgresql: "9.3"
 
-install: pip install tox coveralls --use-mirrors
+install: pip install tox --use-mirrors
 
 before_script:
     - psql -U postgres -c 'create database bpzaroundme;'

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,7 +1,7 @@
 .. :changelog:
 
 History
--------
+=======
 
 0.1.0 (Date TBD)
 ---------------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include requirements.txt requirements.dev.txt requirements.test.txt
+include requirements.txt requirements.dev.txt
 include .coveragerc .travis.yml Makefile Procfile tox.ini .editorconfig
 include LICENSE
 include *.rst

diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -1,5 +1,18 @@
 # Requirements for development and packaging
 
+# flake8 - syntax checking
+mccabe==0.2.1
+pep8==1.5.7
+pyflakes==0.8.1
+flake8==2.2.2
+
+# coverage - line and branch coverage
+coverage==3.7.1
+
+# nose - improved test runner
+nose==1.3.3
+django-nose==1.2
+
 # tox - multi-environment testing
 tox==1.7.2
 

diff --git a/requirements.test.txt b/requirements.test.txt
diff --git a/run_tests.py b/run_tests.py
diff --git a/tox.ini b/tox.ini
@@ -2,14 +2,17 @@
 envlist = py26, py27, py33, py34, style, docs, coverage
 
 [testenv]
+whitelist_externals = make
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/BPZAround.me
-commands = python run_tests.py
+commands = make test
 deps =
     -r{toxinidir}/requirements.txt
-    -r{toxinidir}/requirements.test.txt
+    django-nose
 
 [testenv:style]
+deps =
+    flake8
 commands = make lint
 
 [testenv:docs]
@@ -22,7 +25,8 @@ commands = make html
 [testenv:coverage]
 deps =
     -r{toxinidir}/requirements.txt
-    -r{toxinidir}/requirements.test.txt
+    django-nose
+    coverage
     coveralls
 commands =
     python manage.py test --with-coverage --cover-erase --cover-tests --cover-branches --cover-package=bpz