summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Barrois <raphael.barrois@polyconseil.fr>2015-07-02 16:40:29 +0200
committerRaphaël Barrois <raphael.barrois@polyconseil.fr>2015-07-02 16:40:29 +0200
commita16c90e6323dd51dc097c0d77c6f2c4e0bd0e5fb (patch)
tree93c8beb2d6f84a2fde8f1247d9a6b041be3962dd
parent8e65ae455824f1a592212c5b14b0bb5ddbecf51f (diff)
downloadsemantic-version-a16c90e6323dd51dc097c0d77c6f2c4e0bd0e5fb.tar.gz
Fix coverage building.
-rw-r--r--Makefile5
-rw-r--r--dev_requirements.txt1
-rw-r--r--dev_requirements_django1.7.txt2
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c700042..4b394e1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ install-deps: auto_dev_requirements_django$(DJANGO_VERSION).txt
pip freeze
auto_dev_requirements_%.txt: dev_requirements_%.txt dev_requirements.txt requirements.txt
- grep --no-filename "^[^-]" $^ | grep -v "^Django" > $@
+ grep --no-filename "^[^#-]" $^ | grep -v "^Django" > $@
echo "Django>=$(DJANGO_VERSION),<$(NEXT_DJANGO_VERSION)" >> $@
clean:
@@ -46,6 +46,9 @@ coverage: install-deps
$(COVERAGE) report "--include=$(PACKAGE)/*.py,$(TESTS_DIR)/*.py"
$(COVERAGE) html "--include=$(PACKAGE)/*.py,$(TESTS_DIR)/*.py"
+coverage-xml-report: coverage
+ $(COVERAGE) xml "--include=$(PACKAGE)/*.py,$(TESTS_DIR)/*.py"
+
doc:
$(MAKE) -C $(DOC_DIR) html
diff --git a/dev_requirements.txt b/dev_requirements.txt
index 94a0e83..75e67d6 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1 +1,2 @@
Django
+coverage
diff --git a/dev_requirements_django1.7.txt b/dev_requirements_django1.7.txt
index 6a242b1..5fded43 100644
--- a/dev_requirements_django1.7.txt
+++ b/dev_requirements_django1.7.txt
@@ -1,3 +1 @@
-r dev_requirements.txt
-
-South>=1.0