summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-10-30 16:48:27 -0400
committerNed Batchelder <ned@nedbatchelder.com>2021-10-30 16:48:27 -0400
commit79f832f2f50b441cccf617954cdd51f411c68677 (patch)
tree771f8188540a995a6a7b9d7eed3999b312c071c7
parent40131f076c0784b331c6e0a5d8f88ff7b84b7296 (diff)
downloadpython-coveragepy-git-79f832f2f50b441cccf617954cdd51f411c68677.tar.gz
build: clean up the Makefile a bit
-rw-r--r--Makefile18
-rw-r--r--howto.txt3
-rw-r--r--setup.cfg2
3 files changed, 6 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 5f3d9596..b1cc8496 100644
--- a/Makefile
+++ b/Makefile
@@ -44,24 +44,13 @@ $(CSS): $(SCSS)
pysassc --style=compact $(SCSS) $@
cp $@ tests/gold/html/styled
-LINTABLE = coverage tests igor.py setup.py __main__.py
-
lint: ## Run linters and checkers.
tox -q -e lint
-test:
- tox -q -e py39 $(ARGS)
-
-PYTEST_SMOKE_ARGS = -n 6 -m "not expensive" --maxfail=3 $(ARGS)
+PYTEST_SMOKE_ARGS = -n auto -m "not expensive" --maxfail=3 $(ARGS)
smoke: ## Run tests quickly with the C tracer in the lowest supported Python versions.
- COVERAGE_NO_PYTRACER=1 tox -q -e py39 -- $(PYTEST_SMOKE_ARGS)
-
-pysmoke: ## Run tests quickly with the Python tracer in the lowest supported Python versions.
- COVERAGE_NO_CTRACER=1 tox -q -e py39 -- $(PYTEST_SMOKE_ARGS)
-
-metasmoke:
- COVERAGE_NO_PYTRACER=1 ARGS="-e py39" make clean metacov metahtml
+ COVERAGE_NO_PYTRACER=1 tox -q -e py36 -- $(PYTEST_SMOKE_ARGS)
# Coverage measurement of coverage.py itself (meta-coverage). See metacov.ini
# for details.
@@ -72,6 +61,9 @@ metacov: ## Run meta-coverage, measuring ourself.
metahtml: ## Produce meta-coverage HTML reports.
python igor.py combine_html
+metasmoke:
+ COVERAGE_NO_PYTRACER=1 ARGS="-e py39" make clean metacov metahtml
+
PIP_COMPILE = pip-compile --upgrade --allow-unsafe
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the *.pip files with the latest packages satisfying *.in files
diff --git a/howto.txt b/howto.txt
index 2ffd794e..282bbda9 100644
--- a/howto.txt
+++ b/howto.txt
@@ -96,9 +96,6 @@
- pip install -r requirements/dev.pip
- $ tox
-- Testing on Linux:
- - $ make test_linux
-
- For complete coverage testing:
$ make metacov
diff --git a/setup.cfg b/setup.cfg
index 47192429..e8cd8551 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
[tool:pytest]
-addopts = -q -n3 --strict-markers --force-flaky --no-flaky-report -rfeX --failed-first
+addopts = -q -n auto --strict-markers --force-flaky --no-flaky-report -rfeX --failed-first
python_classes = *Test
markers =
expensive: too slow to run during "make smoke"