mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Lars Pedersen <lapeddk@gmail.com>
To: ptxdist@pengutronix.de
Cc: Lars Pedersen <lapeddk@gmail.com>
Subject: [ptxdist] [PATCH 3/4] python3-importlib-metadata: Version bump 1.7.0 -> 8.4.0
Date: Fri, 27 Sep 2024 13:38:29 +0200	[thread overview]
Message-ID: <20240927113830.415517-3-lapeddk@gmail.com> (raw)
In-Reply-To: <20240927113830.415517-1-lapeddk@gmail.com>

* Add extract.post patch to set a static version in pyproject.toml
* python3-zipp is now a build requirement instead of just runtime

Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
---
 rules/python3-importlib-metadata.in   |  3 ++-
 rules/python3-importlib-metadata.make | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/rules/python3-importlib-metadata.in b/rules/python3-importlib-metadata.in
index 602e396b3..897970da8 100644
--- a/rules/python3-importlib-metadata.in
+++ b/rules/python3-importlib-metadata.in
@@ -2,9 +2,10 @@
 
 config PYTHON3_IMPORTLIB_METADATA
 	tristate
+	select HOST_PYTHON3_PYBUILD
 	select HOST_PYTHON3_SETUPTOOLS_SCM
 	select PYTHON3
-	select PYTHON3_ZIPP		if RUNTIME
+	select PYTHON3_ZIPP
 	prompt "importlib-metadata"
 	help
 	  A library to access the metadata for a Python package.
diff --git a/rules/python3-importlib-metadata.make b/rules/python3-importlib-metadata.make
index 1426b5035..e9cbe43bf 100644
--- a/rules/python3-importlib-metadata.make
+++ b/rules/python3-importlib-metadata.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_IMPORTLIB_METADATA) += python3-importlib-metadata
 #
 # Paths and names
 #
-PYTHON3_IMPORTLIB_METADATA_VERSION	:= 1.7.0
-PYTHON3_IMPORTLIB_METADATA_MD5		:= 4505ea85600cca1e693a4f8f5dd27ba8
+PYTHON3_IMPORTLIB_METADATA_VERSION	:= 8.4.0
+PYTHON3_IMPORTLIB_METADATA_MD5		:= a21dfeb76ac09ec82011bedf45e203b5 
 PYTHON3_IMPORTLIB_METADATA		:= importlib_metadata-$(PYTHON3_IMPORTLIB_METADATA_VERSION)
 PYTHON3_IMPORTLIB_METADATA_SUFFIX	:= tar.gz
 PYTHON3_IMPORTLIB_METADATA_URL		:= $(call ptx/mirror-pypi, importlib_metadata, $(PYTHON3_IMPORTLIB_METADATA).$(PYTHON3_IMPORTLIB_METADATA_SUFFIX))
@@ -23,7 +23,7 @@ PYTHON3_IMPORTLIB_METADATA_SOURCE	:= $(SRCDIR)/$(PYTHON3_IMPORTLIB_METADATA).$(P
 PYTHON3_IMPORTLIB_METADATA_DIR		:= $(BUILDDIR)/$(PYTHON3_IMPORTLIB_METADATA)
 PYTHON3_IMPORTLIB_METADATA_LICENSE	:= Apache-2.0
 PYTHON3_IMPORTLIB_METADATA_LICENSE_FILES := \
-	file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e
+	file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -31,6 +31,13 @@ PYTHON3_IMPORTLIB_METADATA_LICENSE_FILES := \
 
 PYTHON3_IMPORTLIB_METADATA_CONF_TOOL	:= python3
 
+$(STATEDIR)/python3-importlib-metadata.extract.post:
+	@$(call targetinfo)
+	@$(call world/patchin/post, PYTHON3_IMPORTLIB_METADATA)
+	@sed -i 's/^dynamic =.*/version = "$(PYTHON3_IMPORTLIB_METADATA_VERSION)"/g' $(PYTHON3_IMPORTLIB_METADATA_DIR)/pyproject.toml
+	@$(call touch)
+
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.46.1




  parent reply	other threads:[~2024-09-27 11:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-27 11:38 [ptxdist] [PATCH 1/4] python3-zipp: version bump 3.1.0 -> 3.20.1 Lars Pedersen
2024-09-27 11:38 ` [ptxdist] [PATCH 2/4] host-python3-setuptools-scm: Version bump 4.1.2 -> 8.1.0 Lars Pedersen
2024-09-30  6:32   ` Michael Olbrich
2024-10-03  9:16     ` Lars Pedersen
2024-10-16 10:49       ` Michael Olbrich
2024-09-27 11:38 ` Lars Pedersen [this message]
2024-09-27 11:38 ` [ptxdist] [PATCH 4/4] python3-yoyo-migrations: Version bump 7.3.2 -> 8.2.0 Lars Pedersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240927113830.415517-3-lapeddk@gmail.com \
    --to=lapeddk@gmail.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox