package/python3-setuptools: bump to version 53.0.0
PATCH v2 1/1 package/python3-setuptools: bump to version 53.0.0
Rebased add executable patch.
We can no longer keep the python3 and python2 versions in sync as python2 support was dropped in setuptools version 53.0.0.
Signed-off-by James Hilliard <[email protected]>
---
Changes v1 -> v2:
- Update to 53.0.0 from 46.1.3
- Use 53.0.0 for both target and host python3
---
.../{ => 44.0.0}/0001-add-executable.patch | 0
.../53.0.0/0001-add-executable.patch | 1 +
.../python-setuptools/python-setuptools.hash | 2 +
.../python-setuptools/python-setuptools.mk | 27 +++++--
.../0001-add-executable.patch | 75 ++++++++++++++++++-
...setuptools.hash => python-setuptools.hash} | 0
.../python3-setuptools/python3-setuptools.mk | 10 +--
7 files changed, 102 insertions(+), 13 deletions(-)
rename package/python-setuptools/{ => 44.0.0}/0001-add-executable.patch (100%)
create mode 120000 package/python-setuptools/53.0.0/0001-add-executable.patch
mode change 120000 => 100644 package/python3-setuptools/0001-add-executable.patch
rename package/python3-setuptools/{python3-setuptools.hash => python-setuptools.hash} (100%)package/python-setuptools/44.0.0/0001-add-executable.patch renamed from package/python-setuptools/0001-add-executable.patch +0 -0
package/python-setuptools/53.0.0/0001-add-executable.patch new file +1 -0
@@ -0,0 +1 @@ +../../python3-setuptools/0001-add-executable.patch
package/python-setuptools/python-setuptools.hash +2 -0
@@ -1,4 +1,6 @@ # From https://pypi.org/pypi/setuptools/json md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip +md5 73aa0d4f02cec851514165d1ca8aef2b setuptools-53.0.0.tar.gz sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip +sha256 1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5 setuptools-53.0.0.tar.gz sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE
package/python-setuptools/python-setuptools.mk +21 -6
@@ -4,11 +4,20 @@ # ################################################################################ +HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 +HOST_PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip +HOST_PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 44.0.0 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +PYTHON_SETUPTOOLS_VERSION = 53.0.0 +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/12/68/95515eaff788370246dac534830ea9ccb0758e921ac9e9041996026ecaf2 +else +PYTHON_SETUPTOOLS_VERSION = $(HOST_PYTHON_SETUPTOOLS_VERSION) +PYTHON_SETUPTOOLS_SOURCE = $(HOST_PYTHON_SETUPTOOLS_SOURCE) +PYTHON_SETUPTOOLS_SITE = $(HOST_PYTHON_SETUPTOOLS_SITE) +endif PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python
@@ -16,16 +25,22 @@ PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 +ifeq ($(BR2_PACKAGE_PYTHON3),y) +define PYTHON_SETUPTOOLS_EXTRACT_CMDS + $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) +endef +else define PYTHON_SETUPTOOLS_EXTRACT_CMDS $(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) endef +endif define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) + $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) + mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) + $(RM) -r $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION) endef $(eval $(python-package))
package/python3-setuptools/0001-add-executable.patch deleted +0 -1
@@ -1 +0,0 @@ -../python-setuptools/0001-add-executable.patch
package/python3-setuptools/0001-add-executable.patch new file +74 -0
74 lines not on this page · raw message
package/python3-setuptools/python-setuptools.hash renamed from package/python3-setuptools/python3-setuptools.hash +0 -0
package/python3-setuptools/python3-setuptools.mk +4 -6
@@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 44.0.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +PYTHON3_SETUPTOOLS_VERSION = 53.0.0 +PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/12/68/95515eaff788370246dac534830ea9ccb0758e921ac9e9041996026ecaf2 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools
@@ -16,9 +16,7 @@ HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 define HOST_PYTHON3_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON3_SETUPTOOLS_DL_DIR)/$(PYTHON3_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION) + $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) $(HOST_PYTHON3_SETUPTOOLS_DL_DIR)/$(PYTHON3_SETUPTOOLS_SOURCE) endef $(eval $(host-python-package))
Signature · 1 line
2.25.1