From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 27 Sep 2024 13:39:49 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1su9K8-003O6Z-1o for lore@lore.pengutronix.de; Fri, 27 Sep 2024 13:39:49 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1su9K9-0007HF-7z; Fri, 27 Sep 2024 13:39:49 +0200 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1su9Jk-0006sb-MO for ptxdist@pengutronix.de; Fri, 27 Sep 2024 13:39:25 +0200 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2f75aa08a96so21936431fa.1 for ; Fri, 27 Sep 2024 04:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727437164; x=1728041964; darn=pengutronix.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U+lwGrQFPRBDdL/G6USEL8LZ8dpq/J2X1hth+tiJbpQ=; b=R5viWi19TqJuwacq1GE0A+6BolB7WPSbjuFmROuPowFzuApY+Ceebv2xElkXqDD3JJ ON/noy7wcFjQFCLx822ODeGAldZcjKL88JakzLUUPeeh3hj8Gj36jTpgmNSE91W4cC5F VhIQA40LMcMb5A1M++9fsbsfPPLFBXLdL+35mJOK4ncH295y4T7XqcC9TbPj05gE/xaH Ei8mEVdTrRFSe3mWGfYtQC2GZt4qM++aVK+Ndq4OWpfnR4+sz1WuAwQCNDXUqi0loDHu DVZfTxFEx9jMuNdLNqBu+puyUxrvFSRvD40LYfgSveIKrORB5P2xCF+6iic7dypuLLKX Q8eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727437164; x=1728041964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U+lwGrQFPRBDdL/G6USEL8LZ8dpq/J2X1hth+tiJbpQ=; b=Ne/0zdmjav6HtYOrTKac0JLoNgGa3DAIIJgTIF9K+e1hQ3yHSAsb9Gz5xWV3YrcRY2 RSWaccnd44YhoDZRgc917xC4+xLpTO91bM6KoSmXStnbqP33cG7o0w6i+Z8y+gthEgvg ESj4MxG3u7GF/qgVYVn3F4ijE6CLBSkj90YTh63/mSouYfA8QtkciIN6BsRDzzJSutit vjeDBRyU4iVMWD/0hNG1zVs/5nQed8e56OEHC24VbTQz2BNhqRtat+v5B8MXQ1zF2xWq sH1PCDyJbkq2ecODbNQ1bIdp5Jkiq/OxkShtTz61009BkWe6z16bqqP2PfFobTuP5hYQ vmcQ== X-Gm-Message-State: AOJu0YxNjU5BiZs3enRNRArFevgrhEJtqPjI+hwX2x6xDhoR2DKGE4CH MA+rr/j09Uie7yukBsNsiyD2XOxYhgtchauzD81rGMxUwyosWrdZeuW3dw== X-Google-Smtp-Source: AGHT+IFGZg00KmGtWZhDKTNlQfFdAZ/9Il3IIuSApF9zBKxmjvi6X9k3yivLRBluEnTyypJAiu/QWg== X-Received: by 2002:a05:6512:2214:b0:535:6cf6:92f7 with SMTP id 2adb3069b0e04-5389fc6f43emr2072742e87.59.1727437163598; Fri, 27 Sep 2024 04:39:23 -0700 (PDT) Received: from laped.devtools.kamstrup.dk ([185.181.22.18]) by smtp.googlemail.com with ESMTPSA id 2adb3069b0e04-5389fd5e312sm275606e87.109.2024.09.27.04.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 04:39:22 -0700 (PDT) From: Lars Pedersen To: ptxdist@pengutronix.de Date: Fri, 27 Sep 2024 13:38:29 +0200 Message-ID: <20240927113830.415517-3-lapeddk@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240927113830.415517-1-lapeddk@gmail.com> References: <20240927113830.415517-1-lapeddk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 3/4] python3-importlib-metadata: Version bump 1.7.0 -> 8.4.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lars Pedersen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false * 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 --- 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