Merge branch 'master' into maurits-filter-empty-keywords-master

collective · Oct 4, 2019 · 7888411 · 7888411
2 parents 041d896 + b6a409c
commit 7888411
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,3 @@
+[report]
+include =
+    src/Products/PloneKeywordManager/*
diff --git a/.gitignore b/.gitignore
@@ -5,12 +5,13 @@
 .installed.cfg
 .mr.developer.cfg
 .python-version
-.coveragerc
+.coverage
 bin/
 coverage/
 develop-eggs/
 downloads/
 eggs/
+htmlcov/
 include/
 lib/
 library-settings.txt

diff --git a/.travis.yml b/.travis.yml
@@ -30,11 +30,7 @@ script:
   - if [ ${pyversion:7:1} = 3 ]; then black --check; else echo "Skip black check"; fi
   - bin/test --all
 
-after_script:
-  - bin/createcoverage --output-dir=parts/test/coverage
-
 after_success:
-  - pip install coverage
-  - python -m coverage.pickle2json
+  - bin/createcoverage --output-dir=parts/test/coverage
   - pip install -q coveralls
   - coveralls