summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2016-08-23 17:15:03 -0700
committerAsk Solem <ask@celeryproject.org>2016-08-23 17:18:40 -0700
commitd096d302e61cd505d0100399c7e2220c77b2c001 (patch)
treedca7b97d645ea23657da0426f23af56d491f949c /Makefile
parent8cd68d7c301084a40a017b69203ef6eea67f6ab0 (diff)
downloadpy-amqp-d096d302e61cd505d0100399c7e2220c77b2c001.tar.gz
Use py.test
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 03ab3da..2c95da5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
PROJ=amqp
PGPIDENT="Celery Security Team"
PYTHON=python
+PYTEST=py.test
GIT=git
TOX=tox
-NOSETESTS=nosetests
ICONV=iconv
FLAKE8=flake8
FLAKEPLUS=flakeplus
SPHINX2RST=sphinx2rst
+TESTDIR=t
SPHINX_DIR=docs/
SPHINX_BUILDDIR="${SPHINX_DIR}/_build"
README=README.rst
@@ -77,13 +78,13 @@ apicheck:
(cd "$(SPHINX_DIR)"; $(MAKE) apicheck)
flakecheck:
- $(FLAKE8) --ignore=X999 "$(PROJ)"
+ $(FLAKE8) --ignore=X999 "$(PROJ)" "$(TESTDIR)"
flakediag:
-$(MAKE) flakecheck
flakepluscheck:
- $(FLAKEPLUS) --$(FLAKEPLUSTARGET) "$(PROJ)"
+ $(FLAKEPLUS) --$(FLAKEPLUSTARGET) "$(PROJ)" "$(TESTDIR)"
flakeplusdiag:
-$(MAKE) flakepluscheck
@@ -131,7 +132,8 @@ test:
$(PYTHON) setup.py test
cov:
- $(NOSETESTS) -xv --with-coverage --cover-html --cover-branch
+ (cd $(TESTDIR); $(PYTEST) -xv --cov="$(PROJ)" --cov-report=html)
+ mv $(TESTDIR)/htmlcov .
build:
$(PYTHON) setup.py sdist bdist_wheel