From d7b796406e93b405ad9c276ac96fef7c4007cb15 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 10 Dec 2022 10:13:30 -0700 Subject: [PATCH] package/python-dnspython: bump to version 2.2.1 Backport patch removing wheel dependency. Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...move-spurious-wheel-build-dependency.patch | 29 +++++++++++++++++++ .../python-dnspython/python-dnspython.hash | 4 +-- package/python-dnspython/python-dnspython.mk | 20 ++++--------- 3 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch diff --git a/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch new file mode 100644 index 0000000000..b43217edad --- /dev/null +++ b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch @@ -0,0 +1,29 @@ +From 53b989e4ce32c941d748ad33502600497595914a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 2 Nov 2022 14:01:58 -0600 +Subject: [PATCH] Remove spurious wheel build dependency + +Wheel isn't a build dependency so it shouldn't be in setup_requires. +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +53b989e4ce32c941d748ad33502600497595914a] +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 0abd270..2cb3e06 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -46,7 +46,7 @@ packages = + dns.rdtypes.CH + python_requires = >=3.7 + test_suite = tests +-setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3 ++setup_requires = setuptools>=44; setuptools_scm[toml]>=3.4.3 + + [options.extras_require] + DOH = httpx>=0.21.1; h2>=4.1.0; requests; requests-toolbelt +-- +2.34.1 + diff --git a/package/python-dnspython/python-dnspython.hash b/package/python-dnspython/python-dnspython.hash index c9c74c8d75..29441b41ea 100644 --- a/package/python-dnspython/python-dnspython.hash +++ b/package/python-dnspython/python-dnspython.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dnspython/json -md5 8a362d7b2358be3117683e2dbf9654fc dnspython-2.1.0.zip -sha256 e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 dnspython-2.1.0.zip +md5 c7172f4115cd7b60fd5037cfcd8f9408 dnspython-2.2.1.tar.gz +sha256 0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e dnspython-2.2.1.tar.gz # Locally computed sha256 checksums sha256 c3ea3ff5654b329c19d3bc5f7481af623c3dded4a6145585499f843ad3d741cd LICENSE diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 77e6082807..43030ae476 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -4,24 +4,14 @@ # ################################################################################ -PYTHON_DNSPYTHON_VERSION = 2.1.0 -PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).zip -PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/13/27/5277de856f605f3429d752a39af3588e29d10181a3aa2e2ee471d817485a +PYTHON_DNSPYTHON_VERSION = 2.2.1 +PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz +PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/99/fb/e7cd35bba24295ad41abfdff30f6b4c271fd6ac70d20132fa503c3e768e0 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE PYTHON_DNSPYTHON_SETUP_TYPE = setuptools - -define PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_DNSPYTHON_DL_DIR)/$(PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) -endef - -define HOST_PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_DNSPYTHON_DL_DIR)/$(HOST_PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION) -endef +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) $(eval $(host-python-package))