From 48768ef8c5f04d0bc407f56adb2388e64478083d Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Fri, 30 Dec 2016 14:58:23 -0500
Subject: Various setup/tox/testing tweaks.

- Introduce a `nocov` factor until https://github.com/tox-dev/tox/issues/418
  is fixed.
- Eliminate extraneous test run for coverage and diff_cover tests.
- Rename coverage factor to cov.
- Quieter diffcov and cov output.
- Move around some dependencies.  flufl.testing are not runtime deps.
---
 .gitlab-ci.yml |  6 +++---
 setup.py       |  2 --
 tox.ini        | 27 ++++++++++++++-------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8630fe549..caf51ab5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,13 +21,13 @@ docs:
 
 sqlite:
   script:
-  - tox -e py34,py35,py36
+  - tox -e py34-nocov,py35-nocov,py36-nocov
 
 pgsql:
   services:
   - postgres:latest
   script:
-  - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/postgres.cfg tox -e py34-pg,py35-pg,py36-pg
+  - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/postgres.cfg tox -e py34-nocov-pg,py35-nocov-pg,py36-nocov-pg
   tags:
   - postgres
 
@@ -35,6 +35,6 @@ mysql:
   services:
   - mysql:latest
   script:
-  - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/mysql.cfg tox -e py34-mysql,py35-mysql,py36-mysql
+  - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/mysql.cfg tox -e py34-nocov-mysql,py35-nocov-mysql,py36-nocov-mysql
   tags:
   - mysql
diff --git a/setup.py b/setup.py
index c31817b9a..803e785d4 100644
--- a/setup.py
+++ b/setup.py
@@ -110,10 +110,8 @@ case second `m'.  Any other spelling is incorrect.""",
         'flufl.bounce',
         'flufl.i18n',
         'flufl.lock',
-        'flufl.testing',
         'httplib2',
         'lazr.config',
-        'nose2',
         'passlib',
         'requests',
         'sqlalchemy',
diff --git a/tox.ini b/tox.ini
index 299cbba63..60133f667 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,24 @@
 [tox]
-envlist = {py34,py35,py36}{,-coverage,-diffcov}{,-pg}{,-mysql},qa
-recreate = True
+envlist = {py34,py35,py36}-{nocov,cov,diffcov}{,-mysql,-pg},qa
+#recreate = True
 skip_missing_interpreters = True
 
 [testenv]
 commands =
-    python -m nose2 -v {posargs}
-    {coverage,diffcov}: python -m coverage run {[coverage]rc} -m nose2 -v {posargs}
-    {coverage,diffcov}: python -m coverage combine {[coverage]rc}
-    coverage: python -m coverage html {[coverage]rc}
-    coverage: python -m coverage report -m {[coverage]rc}
+    nocov: python -m nose2 -v {posargs}
+    cov,diffcov: python -m coverage run {[coverage]rc} -m nose2 {posargs}
+    cov,diffcov: python -m coverage combine {[coverage]rc}
+    cov: python -m coverage html {[coverage]rc}
+    cov: python -m coverage report -m {[coverage]rc} --fail-under=93
     diffcov: python -m coverage xml {[coverage]rc}
     diffcov: diff-cover coverage.xml --html-report diffcov.html
-    diffcov: diff-cover coverage.xml
+    diffcov: diff-cover coverage.xml --fail-under=100
 #sitepackages = True
 usedevelop = True
 deps =
-     falcon
-     {coverage,diffcov}: coverage
+     flufl.testing
+     nose2
+     cov,diffcov: coverage
      pg: psycopg2
      mysql: pymysql
      diffcov: diff_cover
@@ -25,9 +26,9 @@ passenv =
     MAILMAN_*
     PYTHON*
 setenv =
-    coverage: COVERAGE_PROCESS_START={[coverage]rcfile}
-    coverage: COVERAGE_OPTIONS="-p"
-    coverage: COVERAGE_FILE={toxinidir}/.coverage
+    cov: COVERAGE_PROCESS_START={[coverage]rcfile}
+    cov: COVERAGE_OPTIONS="-p"
+    cov: COVERAGE_FILE={toxinidir}/.coverage
 
 [testenv:qa]
 basepython = python3
-- 
cgit v1.2.3-70-g09d2