From 39e8943e99190c8b70ca740c75de94e917ddded3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 6 Aug 2024 13:31:05 -0400 Subject: [PATCH] srcpkgs/*: no longer patch out hatch-fancy-pypi-readme --- .../patches/remove_reduntant_build_dep.patch | 25 ---------- srcpkgs/black/template | 2 +- .../gdown/patches/remove-hatch-plugin.patch | 25 ---------- srcpkgs/gdown/template | 2 +- .../patches/drop-fancy-pypi-readme.patch | 33 ------------- srcpkgs/python3-Twisted/template | 2 +- .../patches/remove-pypi-readme.patch | 25 ---------- srcpkgs/python3-httpcore/template | 2 +- .../patches/drop-fancy-pypi-readme.patch | 38 --------------- srcpkgs/python3-httpx/template | 2 +- .../patches/drop-fancy-pypi-readme-dep.patch | 38 --------------- srcpkgs/python3-pydantic/template | 2 +- .../patch-out-hatch-fancy-pypi-readme.patch | 44 ------------------ srcpkgs/python3-scikit-build/template | 2 +- .../patches/drop-fancy-pypi-readme.diff | 46 ------------------- srcpkgs/python3-service_identity/template | 2 +- 16 files changed, 8 insertions(+), 282 deletions(-) delete mode 100644 srcpkgs/black/patches/remove_reduntant_build_dep.patch delete mode 100644 srcpkgs/gdown/patches/remove-hatch-plugin.patch delete mode 100644 srcpkgs/python3-Twisted/patches/drop-fancy-pypi-readme.patch delete mode 100644 srcpkgs/python3-httpcore/patches/remove-pypi-readme.patch delete mode 100644 srcpkgs/python3-httpx/patches/drop-fancy-pypi-readme.patch delete mode 100644 srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch delete mode 100644 srcpkgs/python3-scikit-build/patches/patch-out-hatch-fancy-pypi-readme.patch delete mode 100644 srcpkgs/python3-service_identity/patches/drop-fancy-pypi-readme.diff diff --git a/srcpkgs/black/patches/remove_reduntant_build_dep.patch b/srcpkgs/black/patches/remove_reduntant_build_dep.patch deleted file mode 100644 index 908f9edf57f..00000000000 --- a/srcpkgs/black/patches/remove_reduntant_build_dep.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -26,7 +26,7 @@ preview = true - # NOTE: You don't need this in your own Black configuration. - - [build-system] --requires = ["hatchling>=1.20.0", "hatch-vcs", "hatch-fancy-pypi-readme"] -+requires = ["hatchling>=1.20.0", "hatch-vcs"] - build-backend = "hatchling.build" - - [project] -@@ -96,13 +96,6 @@ blackd = "blackd:patched_main [d]" - Changelog = "https://github.com/psf/black/blob/main/CHANGES.md" - Homepage = "https://github.com/psf/black" - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/markdown" --fragments = [ -- { path = "README.md" }, -- { path = "CHANGES.md" }, --] -- - [tool.hatch.version] - source = "vcs" - diff --git a/srcpkgs/black/template b/srcpkgs/black/template index 38e830e7a3d..55749ca60ce 100644 --- a/srcpkgs/black/template +++ b/srcpkgs/black/template @@ -3,7 +3,7 @@ pkgname=black version=24.4.2 revision=1 build_style=python3-pep517 -hostmakedepends="hatchling hatch-vcs" +hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-click python3-platformdirs python3-pathspec python3-packaging python3-mypy_extensions" checkdepends="${depends} python3-pytest-xdist python3-aiohttp diff --git a/srcpkgs/gdown/patches/remove-hatch-plugin.patch b/srcpkgs/gdown/patches/remove-hatch-plugin.patch deleted file mode 100644 index 367e785e054..00000000000 --- a/srcpkgs/gdown/patches/remove-hatch-plugin.patch +++ /dev/null @@ -1,25 +0,0 @@ -# 'hatch-fancy-pypi-readme' is not really necessary to build -diff --git a/pyproject.toml b/pyproject.toml -index 06e6cc88252..5628a8df080 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling>=1.20.0", "hatch-vcs", "hatch-fancy-pypi-readme"] -+requires = ["hatchling>=1.20.0", "hatch-vcs"] - build-backend = "hatchling.build" - - [project] -@@ -53,12 +53,6 @@ test = [ - [project.urls] - Homepage = "https://github.com/wkentaro/gdown" - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/markdown" --fragments = [ -- { path = "README.md" }, --] -- - [tool.hatch.version] - source = "vcs" - diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template index e098cbb45fa..1620c3f29ac 100644 --- a/srcpkgs/gdown/template +++ b/srcpkgs/gdown/template @@ -3,7 +3,7 @@ pkgname=gdown version=5.2.0 revision=1 build_style=python3-pep517 -hostmakedepends="hatchling hatch-vcs python3-setuptools python3-wheel" +hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-filelock python3-requests python3-six python3-tqdm python3-pysocks python3-BeautifulSoup4" checkdepends="${depends} python3-pytest" diff --git a/srcpkgs/python3-Twisted/patches/drop-fancy-pypi-readme.patch b/srcpkgs/python3-Twisted/patches/drop-fancy-pypi-readme.patch deleted file mode 100644 index 19f61aeb065..00000000000 --- a/srcpkgs/python3-Twisted/patches/drop-fancy-pypi-readme.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 59b1d48..51f1ac8 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,7 +1,6 @@ - [build-system] - requires = [ - "hatchling >= 1.10.0", -- "hatch-fancy-pypi-readme >= 22.5.0", - "incremental >= 22.10.0", - ] - build-backend = "hatchling.build" -@@ -172,20 +172,6 @@ source = "code" - path = "src/twisted/__init__.py" - search-paths = ["src"] - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/x-rst" --fragments = [ -- { path = "README.rst" }, --] -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] --# Munge links of the form `NEWS `_ to point at the appropriate --# location on GitHub so that they function when the long description is --# displayed on PyPI. --pattern = '`([^`]+)\s+<(?!https?://)([^>]+)>`_' --replacement = '`\1 `_' --ignore-case = true -- - [tool.hatch.build.targets.wheel] - packages = [ - "src/twisted", diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template index 94b71479dba..60cfdb54679 100644 --- a/srcpkgs/python3-Twisted/template +++ b/srcpkgs/python3-Twisted/template @@ -3,7 +3,7 @@ pkgname=python3-Twisted version=23.8.0 revision=1 build_style=python3-pep517 -hostmakedepends="hatchling python3-incremental" +hostmakedepends="hatchling hatch-fancy-pypi-readme python3-incremental" makedepends="python3-devel" depends="python3-zope.interface python3-constantly python3-incremental python3-automat python3-hyperlink python3-attrs python3-typing_extensions diff --git a/srcpkgs/python3-httpcore/patches/remove-pypi-readme.patch b/srcpkgs/python3-httpcore/patches/remove-pypi-readme.patch deleted file mode 100644 index 140167a0210..00000000000 --- a/srcpkgs/python3-httpcore/patches/remove-pypi-readme.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling", "hatch-fancy-pypi-readme"] -+requires = ["hatchling"] - build-backend = "hatchling.build" - - [project] -@@ -57,15 +57,6 @@ - "/README.md", - ] - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/markdown" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.md" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "CHANGELOG.md" -- - [tool.mypy] - strict = true - show_error_codes = true diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template index d6fde5bd71f..592237053c3 100644 --- a/srcpkgs/python3-httpcore/template +++ b/srcpkgs/python3-httpcore/template @@ -3,7 +3,7 @@ pkgname=python3-httpcore version=1.0.5 revision=1 build_style=python3-pep517 -hostmakedepends="python3-poetry-core hatchling" +hostmakedepends="python3-poetry-core hatchling hatch-fancy-pypi-readme" depends="python3-h11 python3-sniffio python3-anyio python3-h2 python3-certifi python3-trio python3-socksio" checkdepends="$depends python3-pytest python3-pytest-trio python3-trustme python3-pytest-httpbin" diff --git a/srcpkgs/python3-httpx/patches/drop-fancy-pypi-readme.patch b/srcpkgs/python3-httpx/patches/drop-fancy-pypi-readme.patch deleted file mode 100644 index 5f2567cc3d9..00000000000 --- a/srcpkgs/python3-httpx/patches/drop-fancy-pypi-readme.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling", "hatch-fancy-pypi-readme"] -+requires = ["hatchling"] - build-backend = "hatchling.build" - - [project] ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -71,26 +71,6 @@ - "/README.md", - ] - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/markdown" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.md" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = "\n## Release Information\n\n" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "CHANGELOG.md" --pattern = "\n(###.+?\n)## " -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = "\n---\n\n[Full changelog](https://github.com/encode/httpx/blob/master/CHANGELOG.md)\n" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] --pattern = 'src="(docs/img/.*?)"' --replacement = 'src="https://raw.githubusercontent.com/encode/httpx/master/\1"' -- - # https://beta.ruff.rs/docs/configuration/#using-rufftoml - [tool.ruff] - select = ["E", "F", "I", "B", "PIE"] diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template index 8388ff07107..ff8b7272666 100644 --- a/srcpkgs/python3-httpx/template +++ b/srcpkgs/python3-httpx/template @@ -3,7 +3,7 @@ pkgname=python3-httpx version=0.27.0 revision=1 build_style=python3-pep517 -hostmakedepends="hatchling" +hostmakedepends="hatchling hatch-fancy-pypi-readme" depends="python3-idna python3-certifi python3-h2 python3-Brotli python3-sniffio python3-httpcore python3-click python3-rich python3-Pygments" short_desc="Next generation HTTP client for Python" diff --git a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch deleted file mode 100644 index 6bc5bcf6f33..00000000000 --- a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index aba4d03..d2af96e 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ['hatchling', 'hatch-fancy-pypi-readme>=22.5.0'] -+requires = ['hatchling'] - build-backend = 'hatchling.build' - - [tool.hatch.version] -diff --git a/pyproject.toml b/pyproject.toml -index d2af96e..5ccd6f6 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -128,22 +128,6 @@ Funding = 'https://github.com/sponsors/samuelcolvin' - Source = 'https://github.com/pydantic/pydantic' - Changelog = 'https://docs.pydantic.dev/latest/changelog/' - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = 'text/markdown' --# construct the PyPI readme from README.md and HISTORY.md --fragments = [ -- {path = "README.md"}, -- {text = "\n## Changelog\n\n"}, -- {path = "HISTORY.md", pattern = "(.+?)"}, -- {text = "\n... see [here](https://docs.pydantic.dev/changelog/#v0322-2019-08-17) for earlier changes.\n"}, --] --# convert GitHuB issue/PR numbers and handles to links --substitutions = [ -- {pattern = '(\s+)#(\d+)', replacement = '\1[#\2](https://github.com/pydantic/pydantic/issues/\2)'}, -- {pattern = '(\s+)@([\w\-]+)', replacement = '\1[@\2](https://github.com/\2)'}, -- {pattern = '@@', replacement = '@'}, --] -- - [tool.pytest.ini_options] - testpaths = 'tests' - xfail_strict = true diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template index 70c647c424b..4f9d686ce96 100644 --- a/srcpkgs/python3-pydantic/template +++ b/srcpkgs/python3-pydantic/template @@ -5,7 +5,7 @@ revision=1 build_style=python3-pep517 # requires unpackaged pytest-examples, cloudpickle make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_pickle.py" -hostmakedepends="hatchling" +hostmakedepends="hatchling hatch-fancy-pypi-readme" depends="python3-typing_extensions python3-annotated-types python3-pydantic-core" checkdepends="${depends} python3-pytest python3-pytest-benchmark diff --git a/srcpkgs/python3-scikit-build/patches/patch-out-hatch-fancy-pypi-readme.patch b/srcpkgs/python3-scikit-build/patches/patch-out-hatch-fancy-pypi-readme.patch deleted file mode 100644 index 489356ed8cf..00000000000 --- a/srcpkgs/python3-scikit-build/patches/patch-out-hatch-fancy-pypi-readme.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling", "hatch-fancy-pypi-readme", "hatch-vcs"] -+requires = ["hatchling", "hatch-vcs"] - build-backend = "hatchling.build" - - [project] -@@ -76,34 +76,6 @@ - build.hooks.vcs.version-file = "skbuild/_version.py" - - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/x-rst" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.rst" --start-after = ".. START-INTRO" --end-before = ".. END-INTRO" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "CHANGES.rst" --start-after = ".. START-BRIEF-CHANGELOG" --end-before = ".. END-BRIEF-CHANGELOG" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.rst" --start-after = ".. INJECT-CHANGELOG" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] --pattern = ':pr:`(\d+)`' --replacement = '`#\1 `_' -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] --pattern = ':issue:`(\d+)`' --replacement = '`#\1 `_' -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] --pattern = ':user:`(\S+)`' --replacement = '`@\1 `_' - - - [tool.black] diff --git a/srcpkgs/python3-scikit-build/template b/srcpkgs/python3-scikit-build/template index 77ed235e56b..18c2fcb3648 100644 --- a/srcpkgs/python3-scikit-build/template +++ b/srcpkgs/python3-scikit-build/template @@ -5,7 +5,7 @@ revision=1 build_style=python3-pep517 # test requires setuptools_scm to not be installed make_check_args="-k not(nosetuptoolsscm)" -hostmakedepends="hatch-vcs python3-wheel" +hostmakedepends="hatch-vcs python3-wheel hatch-fancy-pypi-readme" depends="python3-distro python3-packaging python3-setuptools python3-wheel" checkdepends="${depends} cmake gcc-fortran git ninja python3-Cython python3-devel python3-pip python3-pytest-mock python3-requests diff --git a/srcpkgs/python3-service_identity/patches/drop-fancy-pypi-readme.diff b/srcpkgs/python3-service_identity/patches/drop-fancy-pypi-readme.diff deleted file mode 100644 index 73d6def6935..00000000000 --- a/srcpkgs/python3-service_identity/patches/drop-fancy-pypi-readme.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- a/pyproject.toml 2023-06-14 08:54:35.000000000 +0100 -+++ b/pyproject.toml 2023-11-27 23:41:30.341946203 +0000 -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"] -+requires = ["hatchling", "hatch-vcs"] - build-backend = "hatchling.build" - - [project] -@@ -52,36 +52,6 @@ - source = "vcs" - raw-options = { local_scheme = "no-local-version" } - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/markdown" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = "# Service Identity Verification for pyOpenSSL & *cryptography*\n" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.md" --start-after = "spiel-begin -->\n" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = """ -- -- --## Release Information -- --""" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "CHANGELOG.md" --pattern = "\n(###.+?\n)## " -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = """ ------ -- --[→ Complete Changelog](https://service-identity.readthedocs.io/en/stable/changelog.html) --""" -- -- - [tool.pytest.ini_options] - addopts = ["-ra", "--strict-markers", "--strict-config"] - xfail_strict = true diff --git a/srcpkgs/python3-service_identity/template b/srcpkgs/python3-service_identity/template index b9a15288743..6189cb7cd28 100644 --- a/srcpkgs/python3-service_identity/template +++ b/srcpkgs/python3-service_identity/template @@ -3,7 +3,7 @@ pkgname=python3-service_identity version=23.1.0 revision=1 build_style=python3-pep517 -hostmakedepends="hatchling hatch-vcs python3-build" +hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six" checkdepends="${depends}" short_desc="Service identity verification for Python (Python3)"