GNU bug report logs - #58729
[PATCH 0/2] gnu: python-frozendict: Update to 2.3.4.

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 58729 in the body.
You can then email your comments to 58729 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: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH 0/2] gnu: python-frozendict: Update to 2.3.4.
Date: Sun, 23 Oct 2022 05:47:15 +0200

While working on synapse I noticed that they found a memory leak in
python-frozendict.  Updating this needs a newer python-canonicaljson.

Michael Rohleder (2):
  gnu: python-frozendict: Update to 2.3.4.
  gnu: python-canonicaljson: Update to 1.6.3.

 gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)


base-commit: 1f734a6f0a7db5b0e12091a0c869c5c4810ac80e
-- 
2.38.0

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

From: Michael Rohleder <mike <at> rohleder.de>
To: 58729 <at> debbugs.gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH 1/2] gnu: python-frozendict: Update to 2.3.4.
Date: Sun, 23 Oct 2022 05:51:00 +0200

This fixes a potential memory leak with python 3.9:
https://github.com/slezica/python-frozendict/issues/38

* gnu/packages/python-xyz.scm (python-frozendict): Update to 2.3.4.
[home-page]: Set to new upstream repository.
---
 gnu/packages/python-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 51136d8e6e..f3ede1b417 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -79,7 +79,7 @@
 ;;; Copyright © 2020 Ryan Prior <rprior <at> protonmail.com>
 ;;; Copyright © 2020 Josh Holland <josh <at> inv.alid.pw>
 ;;; Copyright © 2020 Yuval Kogman <nothingmuch <at> woobling.org>
-;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
+;;; Copyright © 2020, 2022 Michael Rohleder <mike <at> rohleder.de>
 ;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego <at> posteo.net>
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury <at> disroot.org>
 ;;; Copyright © 2020 Hendursaga <hendursaga <at> yahoo.com>
@@ -25954,15 +25954,15 @@ (define-public python-freetype-py
 (define-public python-frozendict
   (package
     (name "python-frozendict")
-    (version "1.2")
+    (version "2.3.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "frozendict" version))
        (sha256
-        (base32 "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"))))
+        (base32 "0y3zn57i1q5192f7l4w2z2zsy3rrx50g563msaq954r58s1v3d0m"))))
     (build-system python-build-system)
-    (home-page "https://github.com/slezica/python-frozendict")
+    (home-page "https://github.com/Marco-Sulla/python-frozendict")
     (synopsis "Simple immutable mapping for Python")
     (description
      "@dfn{frozendict} is an immutable wrapper around dictionaries that
-- 
2.38.0

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

From: Michael Rohleder <mike <at> rohleder.de>
To: 58729 <at> debbugs.gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH 2/2] gnu: python-canonicaljson: Update to 1.6.3.
Date: Sun, 23 Oct 2022 05:51:01 +0200

* gnu/packages/python-xyz.scm (python-canonicaljson): Update to 1.6.3.
[arguments]: Add phases build, check and install to build with pep517.
Add phase loosen-requirements to build with python-setuptools-scm >3.
[native-inputs]: Add python-pypa-build, python-pytest, python-setuptools,
python-setuptools-scm.
---
 gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f3ede1b417..d5f94d1cfb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -26043,14 +26043,39 @@ (define-public python-py-cpuinfo
 (define-public python-canonicaljson
   (package
     (name "python-canonicaljson")
-    (version "1.4.0")
+    (version "1.6.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "canonicaljson" version))
        (sha256
-        (base32 "0c86g0vvzdcg3nrcsqnbzlfhpprc2i894p8i14hska56yl27d6w9"))))
+        (base32 "0j5lq191jkd483q6xzc16c9fahxf15lrv03mvah9ka3lq85pcnfa"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'loosen-requirements
+           (lambda _
+             ;; Permit newer versions of setuptools_scm
+             (substitute* "pyproject.toml"
+               ((">= 2.0.0, <3") ">= 2.0.0"))))
+          (replace 'build
+            (lambda _
+              ;; ZIP does not support timestamps before 1980.
+              (setenv "SOURCE_DATE_EPOCH" "315532800")
+              (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest"))))
+          (replace 'install
+            (lambda _
+              (let ((whl (car (find-files "dist" "\\.whl$"))))
+                (invoke "pip" "--no-cache-dir" "--no-input"
+                        "install" "--no-deps" "--prefix" #$output whl)))))))
+    (native-inputs
+     (list python-pypa-build python-pytest python-setuptools python-setuptools-scm))
     (propagated-inputs
      (list python-six python-frozendict python-simplejson))
     (home-page "https://github.com/matrix-org/python-canonicaljson")
-- 
2.38.0

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

From: Christopher Baines <mail <at> cbaines.net>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 58729-done <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#58729] [PATCH 0/2] gnu: python-frozendict: Update to 2.3.4.
Date: Sat, 05 Nov 2022 11:51:47 +0100

[Message part 1 (text/plain, inline)]

Michael Rohleder <mike <at> rohleder.de> writes:

> While working on synapse I noticed that they found a memory leak in
> python-frozendict.  Updating this needs a newer python-canonicaljson.
>
> Michael Rohleder (2):
>   gnu: python-frozendict: Update to 2.3.4.
>   gnu: python-canonicaljson: Update to 1.6.3.
>
>  gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++------
>  1 file changed, 31 insertions(+), 6 deletions(-)

Thanks for the patches! I've pushed these to master as
b3147b149c8c44f5b4fe20936438165fa449fe20.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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