diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-15 19:39:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 19:39:40 -0400 |
| commit | 662816b65fbbfaf4e8ff523e39a6034785a4d8eb (patch) | |
| tree | 6ebc35005a3ced68f27cc5295129dc8637675b9d | |
| parent | 2995140fe8fc3d0de9f9fa6fe0d574dc2d9a0ca3 (diff) | |
| parent | 897f409cdf68d99c46e112531e7c256cb2933afd (diff) | |
| download | python-setuptools-git-662816b65fbbfaf4e8ff523e39a6034785a4d8eb.tar.gz | |
Merge pull request #2388 from pypa/feature/plugins-enabled-by-default
Enable flake8 and cov plugins only when installed.
| -rw-r--r-- | appveyor.yml | 22 | ||||
| -rw-r--r-- | conftest.py | 18 | ||||
| -rw-r--r-- | pyproject.toml | 6 | ||||
| -rw-r--r-- | pytest.ini | 2 | ||||
| -rw-r--r-- | setup.cfg | 4 |
5 files changed, 23 insertions, 29 deletions
diff --git a/appveyor.yml b/appveyor.yml index de4e6c66..c067bad7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,18 +8,22 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_JOB_NAME: "python35-x64-vs2015" - PYTHON: "C:\\Python35-x64" + APPVEYOR_JOB_NAME: "Python38-x64-vs2015" + PYTHON: "C:\\Python38-x64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_JOB_NAME: "python35-x64-vs2017" - PYTHON: "C:\\Python35-x64" + APPVEYOR_JOB_NAME: "Python38-x64-vs2017" + PYTHON: "C:\\Python38-x64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - APPVEYOR_JOB_NAME: "python35-x64-vs2019" - PYTHON: "C:\\Python35-x64" - - APPVEYOR_JOB_NAME: "python36-x64" - PYTHON: "C:\\Python36-x64" + APPVEYOR_JOB_NAME: "Python38-x64-vs2019" + PYTHON: "C:\\Python38-x64" - APPVEYOR_JOB_NAME: "python37-x64" PYTHON: "C:\\Python37-x64" + - APPVEYOR_JOB_NAME: "python36-x64" + PYTHON: "C:\\Python36-x64" + - APPVEYOR_JOB_NAME: "python35-x64" + PYTHON: "C:\\Python35-x64" + PYTEST_ADDOPTS: "--cov" + TOX_TESTENV_PASSENV: "PYTEST_ADDOPTS" install: # symlink python from a directory with a space @@ -37,7 +41,7 @@ test_script: - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel - pip install --upgrade tox tox-venv virtualenv - pip freeze --all - - tox -- --cov + - tox after_test: - tox -e coverage,codecov diff --git a/conftest.py b/conftest.py index baffac1a..41ab30b9 100644 --- a/conftest.py +++ b/conftest.py @@ -19,23 +19,5 @@ collect_ignore = [ ] -def pytest_configure(config): - disable_coverage_on_pypy(config) - - -def disable_coverage_on_pypy(config): - """ - Coverage makes tests on PyPy unbearably slow, so disable it. - """ - if '__pypy__' not in sys.builtin_module_names: - return - - # Recommended at pytest-dev/pytest-cov#418 - cov = config.pluginmanager.get_plugin('_cov') - cov.options.no_cov = True - if cov.cov_controller: - cov.cov_controller.pause() - - if sys.version_info < (3, 6): collect_ignore.append('pavement.py') diff --git a/pyproject.toml b/pyproject.toml index cfdc2574..cd66e277 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,3 +41,9 @@ backend-path = ["."] directory = "misc" name = "Misc" showcontent = true + +[tool.jaraco.pytest.plugins.flake8] +addopts = "--flake8" + +[tool.jaraco.pytest.plugins.cov] +addopts = "--cov" @@ -1,5 +1,5 @@ [pytest] -addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt --cov -r sxX +addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor doctest_optionflags=ELLIPSIS ALLOW_UNICODE filterwarnings = @@ -68,10 +68,12 @@ tests = pytest>=3.7 wheel coverage>=4.5.1 - pytest-cov>=2.5.1 + # Coverage is unbearably slow on PyPy + pytest-cov>=2.5.1; python_implementation != "PyPy" paver; python_version>="3.6" pip>=19.1 # For proper file:// URLs support. jaraco.envs + jaraco.test >= 3.1.1; python_version >= "3.6" docs = # Keep these in sync with docs/requirements.txt |