Skip to content

Commit

Permalink
- Package and tox configuration cleanup to allow runing tests in …
Browse files Browse the repository at this point in the history
…parallel
  • Loading branch information
dataflake committed Jun 30, 2020
1 parent b62e188 commit 83692d7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Expand Up @@ -4,6 +4,8 @@ Changelog
3.10 (unreleased)
-----------------

- Package and ``tox`` configuration cleanup to allow runing tests in parallel


3.9 (2020-04-16)
----------------
Expand Down
13 changes: 3 additions & 10 deletions 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']
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Expand Up @@ -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
Expand Down
17 changes: 11 additions & 6 deletions tox.ini
@@ -1,20 +1,19 @@
[tox]
envlist =
lint,
py27,
py35,
py36,
py37,
py38,
coverage,
lint

[testenv]
commands =
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
coverage run {envbindir}/test
deps =
setuptools
zc.buildout
coverage
setenv =
Expand All @@ -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
Expand Down

0 comments on commit 83692d7

Please sign in to comment.