From patchwork Sun Oct 23 03:51:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 43997 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 A471D27BBEA; Mon, 24 Oct 2022 05:23:42 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 A7B5727BBE9 for ; Mon, 24 Oct 2022 05:23:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omkM3-0001KL-Ui for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 19: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 1omS2o-0003fh-Q7 for guix-patches@gnu.org; Sat, 22 Oct 2022 23:53:02 -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 1omS2o-0006ZP-Is for guix-patches@gnu.org; Sat, 22 Oct 2022 23:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omS2o-0001h5-CY for guix-patches@gnu.org; Sat, 22 Oct 2022 23:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58729] [PATCH 1/2] gnu: python-frozendict: Update to 2.3.4. References: <20221023034715.5042-1-mike@rohleder.de> In-Reply-To: <20221023034715.5042-1-mike@rohleder.de> Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Oct 2022 03:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58729@debbugs.gnu.org Cc: Michael Rohleder Received: via spool by 58729-submit@debbugs.gnu.org id=B58729.16664971436452 (code B ref 58729); Sun, 23 Oct 2022 03:53:02 +0000 Received: (at 58729) by debbugs.gnu.org; 23 Oct 2022 03:52:23 +0000 Received: from localhost ([127.0.0.1]:42723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omS2B-0001fz-6N for submit@debbugs.gnu.org; Sat, 22 Oct 2022 23:52:23 -0400 Received: from sxb1nlsmtp01.prod.sxb1.secureserver.net ([92.204.71.154]:45236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omS27-0001fi-KD for 58729@debbugs.gnu.org; Sat, 22 Oct 2022 23:52:22 -0400 Received: from 122.164.205.92.host.secureserver.net ([92.205.164.122]) by : HOSTING RELAY : with ESMTP id mS11oxqZMWS8rmS12omoMy; Sat, 22 Oct 2022 20:51:12 -0700 X-SECURESERVER-ACCT: 92.205.164.122 x-originating-ip: 92.205.164.122 X-CMAE-Analysis: v=2.4 cv=L6PbAcf8 c=1 sm=1 tr=0 ts=6354ba30 a=B/z3iHJ5y0TSvJOmeNZOnw==:117 a=IkcTkHD0fZMA:10 a=Qawa6l4ZSaYA:10 a=NEAV23lmAAAA:8 a=sfOm8-O8AAAA:8 a=6yMSgtjJAAAA:8 a=SwIC22TXAAAA:8 a=uChsZFC9AAAA:8 a=LpNgXrTXAAAA:8 a=CjxXgO3LAAAA:8 a=G7APtdR6iFgJVn7JzxUA:9 a=QEXdDO2ut3YA:10 a=TvTJqdcANYtsRzA46cdi:22 a=8BYyG3x_6qr1n7PN4YH2:22 a=3ei1fCXpV1eyMlHnJ8dW:22 a=ULtXvzFHYWHLyBAuiDia:22 a=LqOpv0_-CX5VL_7kjZO3:22 Received: from [192.168.1.3] (helo=micha.rohleder.de) by 122.164.205.92.host.secureserver.net with esmtp (Exim 4.94.2) (envelope-from ) id 1omS11-003Edd-L9; Sun, 23 Oct 2022 05:51:11 +0200 From: Michael Rohleder Date: Sun, 23 Oct 2022 05:51:00 +0200 Message-Id: <20221023035101.5317-1-mike@rohleder.de> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfL/e1t3WEIqUO7hJgU0WFy93QsWJF1d7nhIUbAMvSuE4u9ALosSbr4haMivxjyEBSafxTwcEen0IC1cBkM1q7YjL87zByk0zRfCc32moZC9l2FTdvhkH C+BHVOEWEErqXMUK3gAdeZkeACADK+YLwbnpyqoO8OpzZTRpGkPkCJ5cICx1DWX/zktmzn90ovS5z3nX1RKUj3zB2pYvMi0vf/tJkiVHTp1+mg0eyA4gCcq0 mMVoj1QJ1jV1u6H3jnE8Uw== 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" X-getmail-retrieved-from-mailbox: Patches 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 ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020, 2021, 2022 Vinicius Monego ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Hendursaga @@ -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 From patchwork Sun Oct 23 03:51:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 43857 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 115DF27BBEA; Mon, 24 Oct 2022 02:53:28 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 1F96B27BBE9 for ; Mon, 24 Oct 2022 02:53:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omkMB-0001R0-8U for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 19:26:15 -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 1omS2p-0003fp-66 for guix-patches@gnu.org; Sat, 22 Oct 2022 23:53:03 -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 1omS2o-0006ZW-Ut for guix-patches@gnu.org; Sat, 22 Oct 2022 23:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omS2o-0001hC-QL for guix-patches@gnu.org; Sat, 22 Oct 2022 23:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58729] [PATCH 2/2] gnu: python-canonicaljson: Update to 1.6.3. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Oct 2022 03:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58729@debbugs.gnu.org Cc: Michael Rohleder Received: via spool by 58729-submit@debbugs.gnu.org id=B58729.16664971526472 (code B ref 58729); Sun, 23 Oct 2022 03:53:02 +0000 Received: (at 58729) by debbugs.gnu.org; 23 Oct 2022 03:52:32 +0000 Received: from localhost ([127.0.0.1]:42728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omS2J-0001gK-Jm for submit@debbugs.gnu.org; Sat, 22 Oct 2022 23:52:31 -0400 Received: from sxb1nlsmtp03.prod.sxb1.secureserver.net ([92.204.71.193]:42557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omS2G-0001fy-Jb for 58729@debbugs.gnu.org; Sat, 22 Oct 2022 23:52:30 -0400 Received: from 122.164.205.92.host.secureserver.net ([92.205.164.122]) by : HOSTING RELAY : with ESMTP id mS1BoPtbOKEPMmS1Bo5CSh; Sat, 22 Oct 2022 20:51:21 -0700 X-SECURESERVER-ACCT: 92.205.164.122 x-originating-ip: 92.205.164.122 X-CMAE-Analysis: v=2.4 cv=e4jAC4l/ c=1 sm=1 tr=0 ts=6354ba39 a=B/z3iHJ5y0TSvJOmeNZOnw==:117 a=Qawa6l4ZSaYA:10 a=NEAV23lmAAAA:8 a=dzEi1OD0rVeblzLuex0A:9 Received: from [192.168.1.3] (helo=micha.rohleder.de) by 122.164.205.92.host.secureserver.net with esmtp (Exim 4.94.2) (envelope-from ) id 1omS1A-003Edd-TO; Sun, 23 Oct 2022 05:51:20 +0200 From: Michael Rohleder Date: Sun, 23 Oct 2022 05:51:01 +0200 Message-Id: <20221023035101.5317-2-mike@rohleder.de> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221023035101.5317-1-mike@rohleder.de> References: <20221023035101.5317-1-mike@rohleder.de> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfH9svjKdguahHoornNSVgXA2pMVPAZx7eFo791GQIjgPWoezDDDoI0BsVlR6QCKe0IKkcCLSR1YAA5RSPXc7vE4gATUXlO6tA5ddejlGoRs5301qjk1Q RhGe8uGFcz3EauFPSD4S0aNwN9fWStu8fUo0sI47n93umccergZRY0TvNRdPKNEVghk4gURdRW9vjGI5CdrdBOGrVuHg3n0/GJHKUKkrBoxuWPkP+BYiQIsT F1T2MKUPQY+dalte16eUAQ== 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" X-getmail-retrieved-from-mailbox: Patches * 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")