From 83692d71fe8da8c71d0b0dfec1282146c0decb1f Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@netz.ooo>
Date: Tue, 30 Jun 2020 14:24:05 +0200
Subject: [PATCH] - Package and ``tox`` configuration cleanup to allow runing
 tests in parallel

---
 CHANGES.rst  |  2 ++
 buildout.cfg | 13 +++----------
 setup.cfg    |  4 ++--
 tox.ini      | 17 +++++++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a8727da..2831f5b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ Changelog
 3.10 (unreleased)
 -----------------
 
+- Package and ``tox`` configuration cleanup to allow runing tests in parallel
+
 
 3.9 (2020-04-16)
 ----------------
diff --git a/buildout.cfg b/buildout.cfg
index df2e248..3c89a2d 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,18 +1,11 @@
 [buildout]
-extends = https://zopefoundation.github.io/Zope/releases/4.x/versions-prod.cfg
+extends =
+    https://zopefoundation.github.io/Zope/releases/4.x/versions-prod.cfg
+    https://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
 develop = .
 parts =
-    scripts
     test
 
-[versions]
-SoupSieve  = <2
-
-[scripts]
-recipe = zc.recipe.egg
-eggs =
-    tox
-
 [test]
 recipe = zc.recipe.testrunner
 defaults = ['-cv']
diff --git a/setup.cfg b/setup.cfg
index 7879a80..431f55f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,11 +25,11 @@ htmldir = parts/lint
 
 [coverage:run]
 branch = True
-source = src
+source = Products.ZSQLMethods
 omit =
 
 [coverage:report]
-fail_under = 60.00
+fail_under = 75.00
 ignore_errors = True
 precision = 2
 show_missing = False
diff --git a/tox.ini b/tox.ini
index 5d19975..f0a0a25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
 envlist =
+   lint,
    py27,
    py35,
    py36,
    py37,
    py38,
    coverage,
-   lint
 
 [testenv]
 commands =
@@ -14,7 +14,6 @@ commands =
     {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
     coverage run {envbindir}/test
 deps =
-    setuptools
     zc.buildout
     coverage
 setenv =
@@ -23,16 +22,22 @@ skip_install = true
 
 [testenv:coverage]
 basepython = python3.6
+depends =
+    py27,
+    py35,
+    py36,
+    py37,
+    py38,
 commands =
     coverage erase
     coverage combine
-    coverage html
-    coverage xml
-    coverage report
+    coverage html -i
+    coverage xml -i
+    coverage report -i
 deps =
     {[testenv]deps}
 setenv =
-    COVERAGE_FILE={toxinidir}/.coverage
+    COVERAGE_FILE=.coverage
 
 [testenv:lint]
 basepython = python3.6