diff options
| author | Chintalagiri Shashank <shashank.chintalagiri@gmail.com> | 2019-11-27 15:11:27 +0530 |
|---|---|---|
| committer | Chintalagiri Shashank <shashank.chintalagiri@gmail.com> | 2019-11-27 15:11:27 +0530 |
| commit | 5288a8314b535d455e8635ee9a3a537cd795845b (patch) | |
| tree | 4233452d40a23ab99d0aab5f977e63df632d3c70 /Makefile | |
| parent | 25b82c988578482fbb57f80d3d30bdf985a9a885 (diff) | |
| parent | 0024c0b045a29621845f4f1b5ee1283e32e38887 (diff) | |
| download | gerbonara-5288a8314b535d455e8635ee9a3a537cd795845b.tar.gz gerbonara-5288a8314b535d455e8635ee9a3a537cd795845b.tar.bz2 gerbonara-5288a8314b535d455e8635ee9a3a537cd795845b.zip | |
Manual merge resolution
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1,6 +1,6 @@ PYTHON ?= python -NOSETESTS ?= nosetests +PYTEST ?= pytest DOC_ROOT = doc EXAMPLES = examples @@ -8,17 +8,19 @@ EXAMPLES = examples .PHONY: clean clean: doc-clean find . -name '*.pyc' -delete - rm -rf coverage .coverage rm -rf *.egg-info + rm -f .coverage + rm -f coverage.xml .PHONY: test test: - $(NOSETESTS) -s -v gerber + $(PYTEST) .PHONY: test-coverage test-coverage: - rm -rf coverage .coverage - $(NOSETESTS) -s -v --with-coverage --cover-package=gerber + rm -f .coverage + rm -f coverage.xml + $(PYTEST) --cov=./ --cov-report=xml .PHONY: install install: |