From patchwork Sat Jun 10 02:25:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50810 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E1B8B27BBEA; Sat, 10 Jun 2023 03:26:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 43DFE27BBE9 for ; Sat, 10 Jun 2023 03:26:18 +0100 (BST) 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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"))) From patchwork Sat Jun 10 02:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50811 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F56427BBEA; Sat, 10 Jun 2023 03:26:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 880A227BBE2 for ; Sat, 10 Jun 2023 03:26:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7oIp-0001Ww-PZ; 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-0001WD-Fr 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 1q7oIm-0006vd-7A for guix-patches@gnu.org; Fri, 09 Jun 2023 22:26:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7oIk-00088z-Ss for guix-patches@gnu.org; Fri, 09 Jun 2023 22:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63628] [PATCH v2 2/2] gnu: python-plotly: Update to 5.14.1. 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.168636395731284 (code B ref 63628); Sat, 10 Jun 2023 02:26:02 +0000 Received: (at 63628) by debbugs.gnu.org; 10 Jun 2023 02:25:57 +0000 Received: from localhost ([127.0.0.1]:32972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7oIe-00088W-LH for submit@debbugs.gnu.org; Fri, 09 Jun 2023 22:25:56 -0400 Received: from mout01.posteo.de ([185.67.36.65]:48869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7oIc-00088A-F1 for 63628@debbugs.gnu.org; Fri, 09 Jun 2023 22:25:54 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E7449240027 for <63628@debbugs.gnu.org>; Sat, 10 Jun 2023 04:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686363948; bh=DsLQfUS88GSmFpy+JLlRK/VhwLnOsmSdtl2GQKSHmug=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=cAIicCQYlMTZjatf0Uy/QtKnAbzgRDo8irJGOYpC2/i52xmnucrizTwg8eFgXraQd 1cPSuIBkejzEsDdOpIUSp9wuZyIcy6pVt1AP2h56RlfSZ+iI9GWfYge9P14fyzKO/e 2+/t3QRB3UW9mU/X3u8hDE7I8+Gqv3gHN4+6FIgw84Zny5H8HFSfhH2u9T68ihceXy inkQORRxgMo3tBUex9pRGlPKOemWSEs0MTf1OhXd+I/PrmYnAH4Ab7PUnxfLo8Se8w doTojYNnuvk+XxsXW7plfZkfZEYXMtZJ6yKWRt/RSq6QAFN5r39Z+4mencYbdqKHbt om4W5jzv7DtJg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QdMHt5CnFz6tm4; Sat, 10 Jun 2023 04:25:46 +0200 (CEST) From: Vinicius Monego Date: Sat, 10 Jun 2023 02:25:11 +0000 Message-Id: <20230610022511.3443924-2-monego@posteo.net> In-Reply-To: <20230610022511.3443924-1-monego@posteo.net> References: <20230610022511.3443924-1-monego@posteo.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graph.scm (python-plotly): Update to 5.14.1. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 4f44d5b5f4..5510828edf 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -218,7 +218,7 @@ (define-public r-rbiofabric (define-public python-plotly (package (name "python-plotly") - (version "5.6.0") + (version "5.14.1") (source (origin (method git-fetch) (uri (git-reference @@ -227,7 +227,7 @@ (define-public python-plotly (file-name (git-file-name name version)) (sha256 (base32 - "0kc9v5ampq2paw6sls6zdchvqvis7b1z8xhdvlhz5xxdr1vj5xnn")))) + "12iy5cswn5c0590fvl87nr6vfyhvbxymrldh4c7dfm2gn6h8z8w0")))) (build-system python-build-system) (arguments (list