From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8IRrGkrfg2TrywAASxT56A (envelope-from ) for ; Sat, 10 Jun 2023 04:26:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0IcfGkrfg2T15gAAauVa8A (envelope-from ) for ; Sat, 10 Jun 2023 04:26:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6E8342ED70 for ; Sat, 10 Jun 2023 04:26:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7oIo-0001Wf-Pf; Fri, 09 Jun 2023 22:26:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7oIm-0001WB-AO for guix-patches@gnu.org; Fri, 09 Jun 2023 22:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7oIl-0006vY-1u for guix-patches@gnu.org; Fri, 09 Jun 2023 22:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7oIk-00088r-HI for guix-patches@gnu.org; Fri, 09 Jun 2023 22:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63628] [PATCH v2 1/2] gnu: python-plotly: Fix version. References: <20230521171951.2431541-1-monego@posteo.net> In-Reply-To: <20230521171951.2431541-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Jun 2023 02:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63628@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 63628-submit@debbugs.gnu.org id=B63628.168636395031264 (code B ref 63628); Sat, 10 Jun 2023 02:26:02 +0000 Received: (at 63628) by debbugs.gnu.org; 10 Jun 2023 02:25:50 +0000 Received: from localhost ([127.0.0.1]:32969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7oIY-00088B-4d for submit@debbugs.gnu.org; Fri, 09 Jun 2023 22:25:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7oIV-00087t-8F for 63628@debbugs.gnu.org; Fri, 09 Jun 2023 22:25:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9460D240027 for <63628@debbugs.gnu.org>; Sat, 10 Jun 2023 04:25:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686363940; bh=Ml3aPctL+2+90v2M/55dGAdvtCaT6uyjGwnm3pGy0Qw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=VPHrfHrtdITXwYiNj/B7iyg0NVR4kpLEatycBLmZ31ESyLebE3K8vKq7e6EsdOmOi Oz1Zwwwja/UIxzBnk5cLZoc8zDN1bBETD4tPkrFaezMqlsz2eG9uPeD6k1fKmKlW2a uFZ7Q43w3MOunpXKSxjgFlMOePGUqJNMbc1+WwbB/SgQIyU23idi5/yFo6jePRI4Gt G8KWnpYc8yMuNOq6AE37ZfIPq6DVmaxYZjFHFIHuX5OUSqCslZqAPr17Z73kMRowIw iKGyuX6NbFWyZ17ncYo6Fs/wHMDHOLHrRKcoUadNbmjbebfeKMlC6DG4smDNVBjV06 hsofw+hhORbyg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QdMHl1Mf5z6tww; Sat, 10 Jun 2023 04:25:38 +0200 (CEST) From: Vinicius Monego Date: Sat, 10 Jun 2023 02:25:10 +0000 Message-Id: <20230610022511.3443924-1-monego@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686363977; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=DQfz2FKh2DGGH2WGwxB+jqrWBi0poAjupuhg+F9XGLI=; b=ZRf7utpzrderE/ORRBbEumn1Nuj5ZCCiHX5ZmcgICiKlpSUr3/VRTxhlLTTTSSGiz5dwgU +is6/0UblmuHMLC2dRjtt/BGiI6r99V3N4Dl9+n4D5UIbQ+tzxPO4RyjIqiB7mZeHmDYP5 s4+FHbXF9p7vZvLy4KqKKGmxJeYuxroKJ7aQWftanpTfWs99tPl1PTaRq8K1i37bBrXIVJ Q8ToewPzRnasHwFJFy3xzzeTeRXNUmfedPHIDN7VS8CSS/saLNBEIoYWlpwGqiE5bTCdNz fYn7VSmAj1v6ttSFOMI3LonMmhuI/AC95Z3KZojt8Iwsl1NvZZ4r/wumlvcCnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=VPHrfHrt; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686363977; a=rsa-sha256; cv=none; b=dBQRgfxOa3nByO2R+z9omzW/mzW7W8qfN9/R7Ac8UCSOM1z4+l6DdUDGxBjyiof3lRVa5l +QesfJJkXLByGGTzcQoiJGc3Gn7AS+Jbb2FMpRGsddkKJxYxrXNGmgiATy99eoerxMC/iH iQIA362biM+XuO1vvqCqSdwfQgbDJ/4sAEo+Ql30XfDu3XGUFpCWcgZaLDvSn8uJebxYnr VoHqcBVWegqAPHFClw14j0CrbzQ1vUG81W45LUwDQmwFm81m3Bn2M9wa+9SFcmfRgL7zix onTWyZOBJn/sxwFiFVE0qdDPdEsfwbnTGX3K/RFoghLTfJbC1z1SF2FwpftI5w== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=VPHrfHrt; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6E8342ED70 X-Spam-Score: -1.31 X-TUID: I70QndQCCB1e * gnu/packages/graph.scm (python-plotly)[arguments]: In the fix-version phase, substitute the correct version string. --- The substitution in setup.py was fine, the problem was with the __version__ attribute. Both are correct now. I also added a comment about versioneer. gnu/packages/graph.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 1091d3d56e..4f44d5b5f4 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Alexander Krotov ;;; Copyright © 2020 Pierre Langlois -;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021, 2023 Vinicius Monego ;;; Copyright © 2021 Alexandre Hannud Abdo ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Marius Bakke @@ -238,11 +238,16 @@ (define-public python-plotly (lambda _ (setenv "SKIP_NPM" "T"))) (add-after 'unpack 'fix-version - ;; Versioneer is useless when there is no git metadata. + ;; TODO: Versioneer in Guix gets its release version from the + ;; parent directory, but the plotly package is located inside a + ;; depth 3 subdirectory. Try to use versioneer if possible. (lambda _ (substitute* "packages/python/plotly/setup.py" (("version=versioneer.get_version\\(),") - (format #f "version=~s," #$version))))) + (format #f "version=~s," #$version))) + (substitute* "packages/python/plotly/plotly/version.py" + (("__version__ = get_versions\\(\\)\\[\"version\"\\]") + (format #f "__version__ = ~s" #$version))))) (add-after 'fix-version 'chdir (lambda _ (chdir "packages/python/plotly"))) -- 2.34.1