enhance CI

qiukunlong · May 5, 2016 · 15dae9f · 15dae9f
1 parent fd2fcb3
commit 15dae9f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -102,51 +102,50 @@ diff_pylint_report: pylint_report.txt
 	diff-quality --violations=pylint pylint_report.txt
 
 .coverage: $(PYSOURCES)
-	python-coverage run --branch --source=${MODULE} tests/test_examples.py
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --branch --source=${MODULE} setup.py test
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-jsonld-context schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-rdfs schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-avro schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-rdf schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-pre schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-index schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.main \
 		--print-metadata schema_salad/metaschema/metaschema.yml \
 		> /dev/null
-	python-coverage run --append --branch --source=${MODULE} \
+	coverage run --append --branch --source=${MODULE} \
 		-m schema_salad.makedoc schema_salad/metaschema/metaschema.yml \
 		> /dev/null
 
-
 coverage.xml: .coverage
-	python-coverage xml
+	coverage xml
 
 coverage.html: htmlcov/index.html
 
 htmlcov/index.html: .coverage
-	python-coverage html
+	coverage html
 	@echo Test coverage of the Python code is now in htmlcov/index.html
 
 coverage-report: .coverage
-	python-coverage report
+	coverage report
 
 diff-cover: coverage-gcovr.xml coverage.xml
 	diff-cover coverage-gcovr.xml coverage.xml
@@ -174,4 +173,10 @@ mypy: ${PYSOURCES}
 	MYPYPATH=typeshed/2.7 mypy --py2 schema_salad
 	#MYPYPATH=typeshed/2.7 mypy --py2  --disallow-untyped-calls schema_salad
 
+jenkins:
+	if ! test -d env ; then virtualenv env ; fi
+	. env/bin/activate ; \
+	${MAKE} install-dep coverage.html coverage.xml mypy pep257_report.txt \
+		sloccount.sc pep8_report.txt pylint_report.txt
+
 FORCE:
diff --git a/schema_salad/makedoc.py b/schema_salad/makedoc.py
@@ -44,6 +44,7 @@ class MyRenderer(mistune.Renderer):
 
     def __init__(self):  # type: () -> None
         super(mistune.Renderer, self).__init__()
+        self.options = {}
 
     def header(self, text, level, raw=None):
         return """<h%i id="%s">%s</h%i>""" % (level, to_id(text), text, level)