summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 28ac2a4e..acb9d041 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
PROJ=kombu
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
@@ -81,13 +82,13 @@ configcheck:
(cd "$(SPHINX_DIR)"; $(MAKE) configcheck)
flakecheck:
- $(FLAKE8) --ignore=X999 "$(PROJ)"
+ $(FLAKE8) --ignore=X999 "$(PROJ)" "$(TESTDIR)"
flakediag:
-$(MAKE) flakecheck
flakepluscheck:
- $(FLAKEPLUS) --$(FLAKEPLUSTARGET) "$(PROJ)"
+ $(FLAKEPLUS) --$(FLAKEPLUSTARGET) "$(PROJ)" "$(TESTDIR)"
flakeplusdiag:
-$(MAKE) flakepluscheck
@@ -135,7 +136,7 @@ test:
$(PYTHON) setup.py test
cov:
- $(NOSETESTS) -xv --with-coverage --cover-html --cover-branch
+ $(PYTEST) -x --cov=kombu --cov-report=html
build:
$(PYTHON) setup.py sdist bdist_wheel