diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 33b961e..326017a 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: @@ -69,7 +61,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..df734b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,6 +4,38 @@ requires = [ "setuptools", ] +[project] +name = "blacken-docs" +version = "1.16.0" +description = "Run Black on Python code blocks in documentation files." +readme = {file = "README.rst", content-type = "text/x-rst"} +license = {text = "MIT"} +maintainers = [{name = "Adam Johnson", email = "me@adamj.eu"}] +authors = [{name = "Anthony Sottile", email = "asottile@umich.edu"}] +requires-python = ">=3.8" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Natural Language :: English", + "Operating System :: OS Independent", + "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", +] +dependencies = [ + "black>=22.1", +] +[project.urls] +Changelog = "https://github.com/adamchainz/blacken-docs/blob/main/CHANGELOG.rst" +Repository = "https://github.com/asottile/blacken-docs" +[project.scripts] +blacken-docs = "blacken_docs:main" + [tool.black] target-version = ['py38'] @@ -13,6 +45,23 @@ addopts = """\ --strict-markers """ +[tool.coverage.run] +branch = true +parallel = true +source = [ + "blacken_docs", + "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 806fa25..aacb9d9 100644 --- a/requirements/py310.txt +++ b/requirements/py310.txt @@ -28,7 +28,7 @@ click==8.1.7 \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de # via black -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ @@ -127,6 +127,7 @@ tomli==2.0.1 \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f # via # black + # coverage # pytest typing-extensions==4.8.0 \ --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \ diff --git a/requirements/py311.txt b/requirements/py311.txt index b15ec91..69ba14f 100644 --- a/requirements/py311.txt +++ b/requirements/py311.txt @@ -28,7 +28,7 @@ click==8.1.7 \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de # via black -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 6e00daf..0ca65b2 100644 --- a/requirements/py312.txt +++ b/requirements/py312.txt @@ -28,7 +28,7 @@ click==8.1.7 \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de # via black -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 4ca893e..73d54b1 100644 --- a/requirements/py38.txt +++ b/requirements/py38.txt @@ -28,7 +28,7 @@ click==8.1.7 \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de # via black -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ @@ -131,6 +131,7 @@ tomli==2.0.1 \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f # via # black + # coverage # pytest typing-extensions==4.8.0 \ --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \ diff --git a/requirements/py39.txt b/requirements/py39.txt index e8dbae2..735ccdb 100644 --- a/requirements/py39.txt +++ b/requirements/py39.txt @@ -28,7 +28,7 @@ click==8.1.7 \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de # via black -coverage==7.3.2 \ +coverage[toml]==7.3.2 \ --hash=sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1 \ --hash=sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63 \ --hash=sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9 \ @@ -131,6 +131,7 @@ tomli==2.0.1 \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f # via # black + # coverage # pytest typing-extensions==4.8.0 \ --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \ diff --git a/requirements/requirements.in b/requirements/requirements.in index bfc9378..d71945f 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,4 +1,4 @@ black>=22.1.0 -coverage +coverage[toml] pytest pytest-randomly diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 31c3145..0000000 --- a/setup.cfg +++ /dev/null @@ -1,65 +0,0 @@ -[metadata] -name = blacken_docs -version = 1.16.0 -description = Run Black on Python code blocks in documentation files. -long_description = file: README.rst -long_description_content_type = text/x-rst -url = https://github.com/asottile/blacken-docs -author = Anthony Sottile -author_email = asottile@umich.edu -maintainer = Adam Johnson -maintainer_email = me@adamj.eu -license = MIT -license_files = LICENSE -classifiers = - Development Status :: 5 - Production/Stable - Intended Audience :: Developers - License :: OSI Approved :: MIT License - Natural Language :: English - Operating System :: OS Independent - 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 -project_urls = - Changelog = https://github.com/adamchainz/blacken-docs/blob/main/CHANGELOG.rst - -[options] -packages = find: -install_requires = - black>=22.1.0 -python_requires = >=3.8 -include_package_data = True -package_dir = - =src -zip_safe = False - -[options.packages.find] -where = src - -[options.entry_points] -console_scripts = - blacken-docs=blacken_docs:main - -[coverage:run] -branch = True -parallel = True -source = - blacken_docs - tests - -[coverage:paths] -source = - src - .tox/**/site-packages - -[coverage:report] -show_missing = True - -[flake8] -max-line-length = 88 -extend-ignore = E203 diff --git a/tox.ini b/tox.ini index 9f24f87..fc3126e 100644 --- a/tox.ini +++ b/tox.ini @@ -17,3 +17,7 @@ commands = -W error::PendingDeprecationWarning \ -m coverage run \ -m pytest {posargs:tests} + +[flake8] +max-line-length = 88 +extend-ignore = E203