From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 03 Oct 2024 11:17:01 +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 1swHxD-005iS7-2t for lore@lore.pengutronix.de; Thu, 03 Oct 2024 11:17:01 +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 1swHxE-0001cI-DR; Thu, 03 Oct 2024 11:17:00 +0200 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1swHws-0001c5-OH; Thu, 03 Oct 2024 11:16:39 +0200 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2fac187eef2so9388891fa.3; Thu, 03 Oct 2024 02:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727946998; x=1728551798; darn=pengutronix.de; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zh+YbJxjoDsGiX7GuIyasskhb1/FOKrVCSGEHpLnzr4=; b=UVDlrvnFgEPgfWewxB092/GFNxAS2z3+T1DNdLuY2KmLlSJ59awB7kRGNZoUlUraP4 KUktZfRsCft9nEV+YZQ5CO3irY1SPs22dWT19eZBoMBLSY6mM39CkgvYF98bH8ZGntOE vJKxMceSdBzdQq+jKTPznGDOWi9S7FaFxQkSpn5jbRzL6Z6CZ7/hwFVG6eelnBLE7jn6 Ox3RBSD/ahE9gZd7MHWrpc58HtXalVsldisWJJgiDzGC0WU0CeHelRg0O3PrXfZvSTOs cFRgPnuwtwnAzgQlIkd5ae9stwMRzDaFP+DAD7c9bJJfOmMiJSbgP5xYwRtznxQ/sPvl dQyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727946998; x=1728551798; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zh+YbJxjoDsGiX7GuIyasskhb1/FOKrVCSGEHpLnzr4=; b=feYBx4raTcAICwh+QI1Bt46CApJcvNoxtDOYl4qAndNoRf+pv6nzMQXUcKibU/+qKh xRzR1z5cShIJOHCTzprwOqubxcckG+yXTqAdJf0hHCHUoEAaddCBXdC/bCqpmx0kby3D TewEgWMhzmg7GbNGQjWqMOZ/ieeN5ayiTTKS5ihapBrZWoUAnBIdpm9nOca8gNBjyWGc ilDTEPlFrwlQ3Cw08uOufHC4/qLStFsbwBNBpmEvG2tRTdes+hJAPTdvT4M+bjGFyNNn deHPb1ldLabgvfXizHwBDBzf0L315Vr1jL/YDiWh+QD7WzqXznG1wvBRQ5tKCYJfb+Lx WqCw== X-Gm-Message-State: AOJu0YwNVSVZmnP3ok+9lMfTObfS+rAGpYzgoItapsviKfxkzauy7h6b AgVGsycXHE+HJJqWlIuO2EFaqdawOjEy57aHKg5VknvcGtsHpnrcyf44uPO7qaUZgt1EjBKn5aL lzSbOQMGkisIkmEC77jnHDpkyENRUZQ== X-Google-Smtp-Source: AGHT+IHYsaJ6IAkP5RNlrtni47ZXn3CD9ACg1S0ko9KKaU5FxnjF/el7ReT+mGkabgNG6Gmp9M8ZKqI+AGljlb4LhuQ= X-Received: by 2002:a05:651c:1541:b0:2fa:dce8:7396 with SMTP id 38308e7fff4ca-2fae427a17amr28990941fa.31.1727946997570; Thu, 03 Oct 2024 02:16:37 -0700 (PDT) MIME-Version: 1.0 References: <20240927113830.415517-1-lapeddk@gmail.com> <20240927113830.415517-2-lapeddk@gmail.com> In-Reply-To: From: Lars Pedersen Date: Thu, 3 Oct 2024 11:16:26 +0200 Message-ID: To: Michael Olbrich Content-Type: text/plain; charset="UTF-8" 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=-3.4 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH 2/4] host-python3-setuptools-scm: Version bump 4.1.2 -> 8.1.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: ptxdist@pengutronix.de 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 On Mon, 30 Sept 2024 at 08:32, Michael Olbrich wrote: > > On Fri, Sep 27, 2024 at 01:38:28PM +0200, Lars Pedersen wrote: > > Signed-off-by: Lars Pedersen > > --- > > rules/host-python3-setuptools-scm.make | 12 ++++++++++-- > > 1 file changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/rules/host-python3-setuptools-scm.make b/rules/host-python3-setuptools-scm.make > > index f413d7b35..0146fa9cd 100644 > > --- a/rules/host-python3-setuptools-scm.make > > +++ b/rules/host-python3-setuptools-scm.make > > @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SETUPTOOLS_SCM) += host-python3-setuptools- > > # > > # Paths and names > > # > > -HOST_PYTHON3_SETUPTOOLS_SCM_VERSION := 4.1.2 > > -HOST_PYTHON3_SETUPTOOLS_SCM_MD5 := e6c9fad17c90516d640868eb833d5150 > > +HOST_PYTHON3_SETUPTOOLS_SCM_VERSION := 8.1.0 > > +HOST_PYTHON3_SETUPTOOLS_SCM_MD5 := d8046dce093a94dc382b68b45f6a6257 > > HOST_PYTHON3_SETUPTOOLS_SCM := setuptools_scm-$(HOST_PYTHON3_SETUPTOOLS_SCM_VERSION) > > HOST_PYTHON3_SETUPTOOLS_SCM_SUFFIX := tar.gz > > HOST_PYTHON3_SETUPTOOLS_SCM_URL := $(call ptx/mirror-pypi, setuptools_scm, $(HOST_PYTHON3_SETUPTOOLS_SCM).$(HOST_PYTHON3_SETUPTOOLS_SCM_SUFFIX)) > > @@ -29,4 +29,12 @@ HOST_PYTHON3_SETUPTOOLS_SCM_LICENSE := MIT > > > > HOST_PYTHON3_SETUPTOOLS_SCM_CONF_TOOL := python3 > > > > +# Patch in version by removing multiline dynamic = [ "version" ] (line 39 to 41) and add static version after project name > > +$(STATEDIR)/host-python3-setuptools-scm.extract.post: > > + @$(call targetinfo) > > + @$(call world/patchin/post, HOST_PYTHON3_SETUPTOOLS_SCM) > > + @sed -i '39,41d' $(HOST_PYTHON3_SETUPTOOLS_SCM_DIR)/pyproject.toml > > Hmmm, I don't like this because it won't break if the stuff we want to > remove, moves to a different place in the file. > > > + @sed -i '/^name =/aversion = "$(HOST_PYTHON3_SETUPTOOLS_SCM_VERSION)"' $(HOST_PYTHON3_SETUPTOOLS_SCM_DIR)/pyproject.toml > > We're collecting multiple packages now that have this kind of hack. I need > to dig into this. We need a better solution for this. What does this > 'dynamic = [ "version" ]' stuff do anyways, that we want to avoid? > > Michael > I don't fully understand this myself. It seems like the dynamic = ["version"} tells the compiler backend (guess that is setuptools) to find version in different/smart/magic ways. I have yet to find a good explanation, but the ptxdist compile stage will fail if it is unable to find a version for the package. /Lars Pedersen > > + @$(call touch) > > + > > # vim: syntax=make > > -- > > 2.46.1 > > > > > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |