diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 575d787..0414f18 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,14 +17,6 @@ repos: rev: 1.2.0 hooks: - id: pyproject-fmt -- repo: https://github.com/asottile/setup-cfg-fmt - rev: v2.5.0 - hooks: - - id: setup-cfg-fmt - args: - - --include-version-classifiers - - --max-py-version - - '3.12' - repo: https://github.com/tox-dev/tox-ini-fmt rev: 1.3.1 hooks: @@ -68,7 +60,6 @@ repos: - flake8-bugbear - flake8-comprehensions - flake8-tidy-imports - - flake8-typing-imports - repo: https://github.com/pre-commit/mirrors-mypy rev: v1.6.1 hooks: diff --git a/pyproject.toml b/pyproject.toml index 74a500d..adf5400 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,6 +4,38 @@ requires = [ "setuptools", ] +[project] +name = "pytest-is-running" +version = "1.5.0" +description = "pytest plugin providing a function to check if pytest is running." +readme = {file = "README.rst", content-type = "text/x-rst"} +keywords = [ + "pytest", +] +license = {text = "MIT"} +authors = [{name = "Adam Johnson", email = "me@adamj.eu"}] +requires-python = ">=3.8" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Framework :: Pytest", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Natural Language :: English", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Typing :: Typed", +] +[project.urls] +Changelog = "https://github.com/adamchainz/pytest-is-running/blob/main/CHANGELOG.rst" +Funding = "https://adamj.eu/books/" +Repository = "https://github.com/adamchainz/pytest-is-running" +[project.entry-points.pytest11] +is_running = "pytest_is_running.plugin" + [tool.black] target-version = ['py38'] @@ -13,6 +45,23 @@ addopts = """\ --strict-markers """ +[tool.coverage.run] +branch = true +parallel = true +source = [ + "pytest_is_running", + "tests", +] + +[tool.coverage.paths] +source = [ + "src", + ".tox/**/site-packages", +] + +[tool.coverage.report] +show_missing = true + [tool.mypy] mypy_path = "src/" namespace_packages = false diff --git a/requirements/py310.txt b/requirements/py310.txt index 4f5e630..a3b1d5b 100644 --- a/requirements/py310.txt +++ b/requirements/py310.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ @@ -87,4 +87,6 @@ pytest-randomly==3.15.0 \ tomli==2.0.1 \ --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f - # via pytest + # via + # coverage + # pytest diff --git a/requirements/py311.txt b/requirements/py311.txt index e7c1b8b..e480599 100644 --- a/requirements/py311.txt +++ b/requirements/py311.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ diff --git a/requirements/py312.txt b/requirements/py312.txt index 19a1d29..fe28d11 100644 --- a/requirements/py312.txt +++ b/requirements/py312.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ diff --git a/requirements/py38.txt b/requirements/py38.txt index 47e6d01..6d7010b 100644 --- a/requirements/py38.txt +++ b/requirements/py38.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ @@ -91,7 +91,9 @@ pytest-randomly==3.15.0 \ tomli==2.0.1 \ --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f - # via pytest + # via + # coverage + # pytest zipp==3.17.0 \ --hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \ --hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0 diff --git a/requirements/py39.txt b/requirements/py39.txt index 82e737e..1d5a7d2 100644 --- a/requirements/py39.txt +++ b/requirements/py39.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ @@ -91,7 +91,9 @@ pytest-randomly==3.15.0 \ tomli==2.0.1 \ --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f - # via pytest + # via + # coverage + # pytest zipp==3.17.0 \ --hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \ --hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0 diff --git a/requirements/requirements.in b/requirements/requirements.in index efe5d3d..59d5434 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,3 +1,3 @@ -coverage +coverage[toml] pytest pytest-randomly diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7fdca8d..0000000 --- a/setup.cfg +++ /dev/null @@ -1,66 +0,0 @@ -[metadata] -name = pytest_is_running -version = 1.5.0 -description = pytest plugin providing a function to check if pytest is running. -long_description = file: README.rst -long_description_content_type = text/x-rst -url = https://github.com/adamchainz/pytest-is-running -author = Adam Johnson -author_email = me@adamj.eu -license = MIT -license_files = LICENSE -classifiers = - Development Status :: 5 - Production/Stable - Framework :: Pytest - Intended Audience :: Developers - License :: OSI Approved :: MIT License - Natural Language :: English - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 - Typing :: Typed -keywords = pytest -project_urls = - Changelog = https://github.com/adamchainz/pytest-is-running/blob/main/CHANGELOG.rst - Funding = https://adamj.eu/books/ - Mastodon = https://fosstodon.org/@adamchainz - Twitter = https://twitter.com/adamchainz - -[options] -packages = find: -python_requires = >=3.8 -include_package_data = True -package_dir = - =src -zip_safe = False - -[options.packages.find] -where = src - -[options.entry_points] -pytest11 = - is_running = pytest_is_running.plugin - -[coverage:run] -branch = True -disable_warnings = no-data-collected # coverage only in subprocesses -parallel = True -source = - pytest_is_running - tests - -[coverage:paths] -source = - src/ - .tox/**/site-packages - -[coverage:report] -show_missing = True - -[flake8] -max-line-length = 88 -extend-ignore = E203 diff --git a/tests/test_pytest_is_running.py b/tests/test_pytest_is_running.py index 6f3911b..e91119f 100644 --- a/tests/test_pytest_is_running.py +++ b/tests/test_pytest_is_running.py @@ -26,12 +26,12 @@ def our_tmp_path(tmp_path): yield tmp_path -SETUP_CFG_PATH = Path(__file__).resolve().parent.parent / "setup.cfg" +PYPROJECT_PATH = Path(__file__).resolve().parent.parent / "pyproject.toml" def run_and_check(command: list[str], cwd: Path) -> None: env = dict( - os.environ, PYTHONPATH=str(cwd), COVERAGE_PROCESS_START=str(SETUP_CFG_PATH) + os.environ, PYTHONPATH=str(cwd), COVERAGE_PROCESS_START=str(PYPROJECT_PATH) ) subprocess.run( [sys.executable] + command, diff --git a/tox.ini b/tox.ini index b05b9ed..003b4cd 100644 --- a/tox.ini +++ b/tox.ini @@ -17,3 +17,7 @@ commands = -W error::PendingDeprecationWarning \ -m coverage run \ -m pytest -p no:is_running {posargs:tests} + +[flake8] +max-line-length = 88 +extend-ignore = E203