Skip to content

Commit 2e7b697

Browse files
committed
Remove explicit coverage usage from setup.py
1 parent 3c24ed2 commit 2e7b697

4 files changed

Lines changed: 17 additions & 40 deletions

File tree

.coveragerc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ parallel = true
77
data_file = reports/.coverage
88
patch =
99
subprocess
10-
execv
11-
_exit

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Run tests
5858
run: |
5959
mkdir -p reports/junit/
60-
coverage run -m pytest -m ${{ matrix.mark }} --junitxml=reports/junit/${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.mark }}.xml
60+
coverage run --parallel-mode -m pytest -n auto -m ${{ matrix.mark }} --junitxml=reports/junit/${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.mark }}.xml
6161
6262
- name: Upload coverage results
6363
uses: actions/upload-artifact@v6

tests/lib/util.py

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -242,27 +242,18 @@ def create_setup_py(
242242
"setup.py",
243243
textwrap.dedent(
244244
f"""
245-
from coverage.control import Coverage
246-
247-
coverage = Coverage()
248-
coverage.start()
249-
250-
try:
251-
import setuptools
252-
253-
setuptools.setup(
254-
name="mypkg",
255-
{cfg}
256-
setup_requires=[
257-
"setuptools>=41",
258-
"wheel",
259-
"coverage",
260-
"setuptools-git-versioning",
261-
]
262-
)
263-
finally:
264-
coverage.stop()
265-
coverage.save()
245+
import setuptools
246+
247+
setuptools.setup(
248+
name="mypkg",
249+
{cfg}
250+
setup_requires=[
251+
"setuptools>=41",
252+
"wheel",
253+
"coverage",
254+
"setuptools-git-versioning",
255+
]
256+
)
266257
"""
267258
),
268259
**kwargs,
@@ -309,9 +300,6 @@ def get_version_module(cwd: str | os.PathLike, args: list[str] | None = None, **
309300
cwd,
310301
sys.executable,
311302
"-m",
312-
"coverage",
313-
"run",
314-
"-m",
315303
"setuptools_git_versioning",
316304
*(args or []),
317305
"-vv",

tests/test_integration/test_config.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,11 @@ def test_config_not_used(repo):
3333
"setup.py",
3434
textwrap.dedent(
3535
"""
36-
from coverage.control import Coverage
36+
import setuptools
3737
38-
coverage = Coverage()
39-
coverage.start()
40-
41-
try:
42-
import setuptools
43-
44-
setuptools.setup(
45-
name="mypkg",
46-
)
47-
finally:
48-
coverage.stop()
49-
coverage.save()
38+
setuptools.setup(
39+
name="mypkg",
40+
)
5041
"""
5142
),
5243
)

0 commit comments

Comments
 (0)