Skip to content

Commit b571b3a

Browse files
committed
Argh, can't do version slugs except in the default test env… let's do the XML dance there.
1 parent 883a33d commit b571b3a

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed

.github/workflows/cicd.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,10 @@ jobs:
208208
else # CPython
209209
py_test="py${py/./}"; # Add "py" prefix, remove "."
210210
fi;
211-
env_test="test-${py_test}";
211+
env_test="test-${py_test}-coverage_xml";
212212
echo "Test environment: ${env_test}";
213213
tox -e "${env_test}";
214214
tar cvzf pytest-logs.tgz ".tox/${env_test}/log";
215-
tox -e "coverage_xml-${py_test}";
216215
217216
- name: Upload pytest log artifact
218217
if: failure()

tox.ini

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ passenv = CI
7777

7878
commands =
7979
pytest --cov={env:PY_MODULE} --cov-report=term-missing:skip-covered --doctest-modules {posargs:src/{env:PY_MODULE}}
80+
coverage_xml: coverage xml
8081

8182

8283
##
@@ -263,33 +264,6 @@ commands =
263264
- coverage html
264265

265266

266-
##
267-
# Coverage XML
268-
##
269-
270-
[testenv:coverage_xml]
271-
272-
description = generate coverage XML
273-
274-
depends = {[coverage_report]depends}
275-
276-
basepython = {[default]basepython}
277-
278-
skip_install = True
279-
280-
deps =
281-
# coverage 5.0 drops Python 3.4 support
282-
py{26,27,34,py2}: coverage==4.5.4 # rq.filter: <5
283-
py{35,36,37,38,39,py3}: coverage==5.3.1
284-
285-
setenv =
286-
{[testenv:coverage_report]setenv}
287-
288-
commands =
289-
coverage combine
290-
coverage xml
291-
292-
293267
##
294268
# Codecov
295269
##

0 commit comments

Comments
 (0)