Skip to content

Commit 64b9635

Browse files
aleguy02webknjaz
andcommitted
Apply suggestions from code review
pass entire CLI flag in workflow Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
1 parent 3d7b325 commit 64b9635

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,14 +278,14 @@ jobs:
278278
if: "! matrix.use_coverage"
279279
shell: bash
280280
env:
281-
JUNIT_XML_PATH: junit-${{ matrix.name }}.xml
281+
_PYTEST_TOX_POSARGS_JUNIT: --junitxml=junit-${{ matrix.name }}.xml
282282
run: tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz`
283283

284284
- name: Test with coverage
285285
if: "matrix.use_coverage"
286286
shell: bash
287287
env:
288-
JUNIT_XML_PATH: junit-${{ matrix.name }}.xml
288+
_PYTEST_TOX_POSARGS_JUNIT: --junitxml=junit-${{ matrix.name }}.xml
289289
run: tox run -e ${{ matrix.tox_env }}-coverage --installpkg `find dist/*.tar.gz`
290290

291291
- name: Upload coverage to Codecov

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ description =
6161
under `{basepython}`
6262
doctesting: including doctests
6363
commands =
64-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}} --junitxml={env:JUNIT_XML_PATH}
65-
doctesting: {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest --junitxml={env:JUNIT_XML_PATH}
64+
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
65+
doctesting: {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules {env:_PYTEST_TOX_POSARGS_JUNIT:} --pyargs _pytest
6666
coverage: coverage combine
6767
coverage: coverage report -m
6868
# Run `coverage xml` only on CI.
@@ -72,9 +72,8 @@ passenv =
7272
PYTEST_ADDOPTS
7373
TERM
7474
CI
75-
JUNIT_XML_PATH
7675
setenv =
77-
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:} {env:_PYTEST_FILES:}
76+
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_JUNIT:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:} {env:_PYTEST_FILES:}
7877

7978
# See https://docs.python.org/3/library/io.html#io-encoding-warning
8079
# If we don't enable this, neither can any of our downstream users!

0 commit comments

Comments
 (0)