GNU bug report logs - #63628
[PATCH 1/2] gnu: python-plotly: Fix version.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63628 in the body.
You can then email your comments to 63628 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH 1/2] gnu: python-plotly: Fix version.
Date: Sun, 21 May 2023 17:19:51 +0000

* gnu/packages/graph.scm (python-plotly)[arguments]: In the fix-version phase,
substitute the correct version string.
---
 gnu/packages/graph.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 1091d3d56e..4e4e3b3e73 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2019 Andreas Enge <andreas <at> enge.fr>
 ;;; Copyright © 2020 Alexander Krotov <krotov <at> iitp.ru>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlos <at> gmx.com>
-;;; Copyright © 2021 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2021, 2023 Vinicius Monego <monego <at> posteo.net>
 ;;; Copyright © 2021 Alexandre Hannud Abdo <abdo <at> member.fsf.org>
 ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Marius Bakke <marius <at> gnu.org>
@@ -240,9 +240,10 @@ (define-public python-plotly
           (add-after 'unpack 'fix-version
             ;; Versioneer is useless when there is no git metadata.
             (lambda _
-              (substitute* "packages/python/plotly/setup.py"
-                (("version=versioneer.get_version\\(),")
-                 (format #f "version=~s," #$version)))))
+              (substitute* "packages/python/plotly/plotly/version.py"
+                (("\\_\\_version\\_\\_ = get\\_versions\\(\\)\\[\"version\"\\]")
+                 (format #f "__version__ = ~s"
+                         #$(package-version this-package))))))
           (add-after 'fix-version 'chdir
             (lambda _
               (chdir "packages/python/plotly")))
-- 
2.34.1

Message #8 received at 63628 <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: 63628 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH 2/2] gnu: python-plotly: Update to 5.14.1.
Date: Sun, 21 May 2023 17:21:39 +0000

* 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 4e4e3b3e73..3fba34459a 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
-- 
2.34.1

Message #11 received at 63628 <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: 63628 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH v2 1/2] gnu: python-plotly: Fix version.
Date: Sat, 10 Jun 2023 02:25:10 +0000

* 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 <andreas <at> enge.fr>
 ;;; Copyright © 2020 Alexander Krotov <krotov <at> iitp.ru>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlos <at> gmx.com>
-;;; Copyright © 2021 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2021, 2023 Vinicius Monego <monego <at> posteo.net>
 ;;; Copyright © 2021 Alexandre Hannud Abdo <abdo <at> member.fsf.org>
 ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Marius Bakke <marius <at> gnu.org>
@@ -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

Message #14 received at 63628 <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: 63628 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH v2 2/2] gnu: python-plotly: Update to 5.14.1.
Date: Sat, 10 Jun 2023 02:25:11 +0000

* 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
-- 
2.34.1

Message #19 received at 63628-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Vinicius Monego <monego <at> posteo.net>
Cc: 63628-done <at> debbugs.gnu.org
Subject: Re: [bug#63628] [PATCH 1/2] gnu: python-plotly: Fix version.
Date: Sat, 01 Jul 2023 13:13:42 +0200

Hello,

Vinicius Monego <monego <at> posteo.net> writes:

> * gnu/packages/graph.scm (python-plotly)[arguments]: In the fix-version phase,
> substitute the correct version string.

Applied (v2). Thank you.

Regards,
-- 
Nicolas Goaziou

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.