Merge branch 'master' into revert_#150_Ellipsis

zopefoundation · Sep 2, 2019 · 295f5ef · 295f5ef
2 parents 0edcd14 + 64f238e
commit 295f5ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
     include:
         - name: "docs,lint"
           python: "3.6"
-          env: TOXENV=docs,lint
+          env: TOXENV=docs,lint-py36
           before_install:
           after_success:
         - python: "2.7"
@@ -18,8 +18,10 @@ matrix:
           env: TOXENV=py37,py37-datetime
         - python: "3.8-dev"
           env: TOXENV=py38,py38-datetime
+
 before_install:
     -  travis_retry pip install -U -c constraints.txt coveralls coverage
+
 install:
     - travis_retry pip install -U pip setuptools
     - travis_retry pip install -U -c constraints.txt tox
@@ -33,5 +35,6 @@ after_success:
 
 notifications:
     email: false
+
 cache:
   pip: true
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,9 +2,9 @@
 
 environment:
   matrix:
-    - PROFILE: py27-conventions
-      PYTHON_VERSION: "2.7"
-      TOXENV: "lint,docs"
+    - PROFILE: conventions
+      PYTHON_VERSION: "3.6"
+      TOXENV: "docs,lint-py36"
     - PROFILE: py27
       PYTHON_VERSION: "2.7"
       TOXENV: "py27,py27-datetime"

diff --git a/setup.cfg b/setup.cfg
@@ -46,6 +46,8 @@ source = .
 
 [coverage:report]
 precision = 2
+#fail_under = 100
+skip_covered = True
 show_missing = True
 sort = Name
 

diff --git a/tox.ini b/tox.ini
@@ -48,10 +48,9 @@ commands =
     coverage combine
     coverage html
     coverage xml
-    coverage report --skip-covered --show-missing --fail-under=100.0
+    coverage report --fail-under=100.0
 
 [testenv:isort-apply]
-basepython = python2.7
 skip_install = true
 deps =
     -cconstraints.txt