From 60585adf13c20753d4d97f6dc8d88b54ba4f2e28 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 14 Sep 2024 21:54:31 -0600 Subject: [PATCH] package/python-cheroot: bump to version 10.0.1 Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...ptools-scm-v7-for-building-the-dists.patch | 101 ------------------ package/python-cheroot/python-cheroot.hash | 4 +- package/python-cheroot/python-cheroot.mk | 4 +- 3 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch diff --git a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch deleted file mode 100644 index 837f2804d2..0000000000 --- a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001 -From: Serhii Abarovskyi -Date: Tue, 9 May 2023 18:33:54 +0300 -Subject: [PATCH] Use setuptools-scm v7+ for building the dists - -Since version 7, setuptools-scm has native support for git archive, -so the setuptools-scm-git-archive project is obsolete -and this patch removes it from the build dependencies. -Close #515 - -Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 -Signed-off-by: Fabrice Fontaine ---- - .git_archival.txt | 3 +++ - pyproject.toml | 3 +-- - requirements/dist-build-constraints.in | 3 +-- - requirements/dist-build-constraints.txt | 16 +++++++--------- - setup.cfg | 3 +-- - 5 files changed, 13 insertions(+), 15 deletions(-) - -diff --git a/.git_archival.txt b/.git_archival.txt -index 95cb3eea4e..3994ec0a83 100644 ---- a/.git_archival.txt -+++ b/.git_archival.txt -@@ -1 +1,4 @@ -+node: $Format:%H$ -+node-date: $Format:%cI$ -+describe-name: $Format:%(describe:tags=true)$ - ref-names: $Format:%D$ -diff --git a/pyproject.toml b/pyproject.toml -index b1e5f60a80..88df57dcc1 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -6,8 +6,7 @@ requires = [ - "setuptools>=34.4", - - # Plugins -- "setuptools_scm[toml]>=3.5", -- "setuptools_scm_git_archive>=1.1", -+ "setuptools-scm >= 7.0.0", - ] - build-backend = "setuptools.build_meta" - -diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in -index 26b57228a9..a37baef1a9 100644 ---- a/requirements/dist-build-constraints.in -+++ b/requirements/dist-build-constraints.in -@@ -5,8 +5,7 @@ - setuptools >= 34.4 - - # Plugins --setuptools_scm[toml] >= 3.5 --setuptools_scm_git_archive >= 1.1 -+setuptools-scm[toml] >= 7.0.0 - - # Dynamic (coming from setuptools' PEP 517 build backend) - wheel -diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt -index 525f2be30f..8bd4343ff6 100644 ---- a/requirements/dist-build-constraints.txt -+++ b/requirements/dist-build-constraints.txt -@@ -1,18 +1,16 @@ - # --# This file is autogenerated by pip-compile with python 3.10 --# To update, run: -+# This file is autogenerated by pip-compile with Python 3.10 -+# by the following command: - # - # pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in - # --packaging==21.3 -+packaging==23.1 - # via setuptools-scm --pyparsing==3.0.6 -- # via packaging --setuptools-scm==6.3.2 -+setuptools-scm==7.1.0 - # via -r requirements/dist-build-constraints.in --setuptools-scm-git-archive==1.1 -- # via -r requirements/dist-build-constraints.in --tomli==2.0.0 -+tomli==2.0.1 -+ # via setuptools-scm -+typing-extensions==4.6.3 - # via setuptools-scm - wheel==0.37.1 - # via -r requirements/dist-build-constraints.in -diff --git a/setup.cfg b/setup.cfg -index 1f2b08f4c3..900c7b4feb 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -64,8 +64,7 @@ include_package_data = True - packages = find: - include_package_data = True - setup_requires = -- setuptools_scm>=1.15.0 -- setuptools_scm_git_archive>=1.0 -+ setuptools_scm >= 7.0.0 - install_requires = - importlib_metadata; python_version < '3.8' - more_itertools >= 2.6 diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index d103eb6f96..2d63dd9651 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cheroot/json -md5 be96fa052c54892240f916fbb06cc571 cheroot-10.0.0.tar.gz -sha256 59c4a1877fef9969b3c3c080caaaf377e2780919437853fc0d32a9df40b311f0 cheroot-10.0.0.tar.gz +md5 0fce2608fcb31c16c81945c73e283724 cheroot-10.0.1.tar.gz +sha256 e0b82f797658d26b8613ec8eb563c3b08e6bd6a7921e9d5089bd1175ad1b1740 cheroot-10.0.1.tar.gz # Locally computed sha256 checksums sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 19aa7ae193..3d39eac7a0 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 10.0.0 +PYTHON_CHEROOT_VERSION = 10.0.1 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/08/7c/95c154177b16077de0fec1b821b0d8b3df2b59c5c7b3575a9c1bf52a437e +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/63/e2/f85981a51281bd30525bf664309332faa7c81782bb49e331af603421dbd1 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools