From patchwork Sat May 13 16:59:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 49989 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 EBE0527BBF0; Sat, 13 May 2023 18:01:22 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3B71427BBE2 for ; Sat, 13 May 2023 18:01:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxscD-00076k-KS; Sat, 13 May 2023 13:01:05 -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 1pxscA-00075x-Hc for guix-patches@gnu.org; Sat, 13 May 2023 13:01: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 1pxscA-0007I5-70 for guix-patches@gnu.org; Sat, 13 May 2023 13:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxscA-0002AG-2W for guix-patches@gnu.org; Sat, 13 May 2023 13:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63486] [PATCH 1/3] gnu: python-txtorcon: Fix failing build. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 17:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63486@debbugs.gnu.org Cc: Juliana Sims Received: via spool by 63486-submit@debbugs.gnu.org id=B63486.16839972168230 (code B ref 63486); Sat, 13 May 2023 17:01:02 +0000 Received: (at 63486) by debbugs.gnu.org; 13 May 2023 17:00:16 +0000 Received: from localhost ([127.0.0.1]:39468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsbQ-00028d-Cd for submit@debbugs.gnu.org; Sat, 13 May 2023 13:00:16 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:60491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsbP-00028G-Fw for 63486@debbugs.gnu.org; Sat, 13 May 2023 13:00:15 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id B7A1260005; Sat, 13 May 2023 17:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683997208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mnZFFsle8+1t5WZJLsaWClfP3i1CtvpvF0hZPdeUjKs=; b=hLFXT9CpgsiSGgZqxh5FpybBHJTE2CeJamzJEjJASUWpJgUJeS4l4EVk59mSDIABBtJ2Te 2K1l9yqBHTvVRrdwAEnPVFpN984FxDv/bjWqFxKMQ8JwnmTUgKUu/kXdwMI/kgTf/L9Pks fda/OUvQUx56EOXrTHloHpn3wUtRkckFGKK/Gdkc9UXremt+PbQnKRyKNAcPEDC8eTCPDl AmYBrfBKF8qk4WyKpm+zOvt3Ndr0XZHruxBCoj5FAGqqr7kEXBNJpCnoC/Dv1xIjFQTsnh 4wdTk8+gZz8ZYl49TVxh+bbzXcTSe57WHOFxv7SVc3Iy+5IQGhhPaw+JakHSmQ== From: Juliana Sims Date: Sat, 13 May 2023 12:59:46 -0400 Message-Id: <3a3bef007ba02cd4c855f27b14d65cf500e5b44b.1683996444.git.juli@incana.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/python-crypto.scm (python-txtorcon): Fix failing build. --- gnu/packages/python-crypto.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b1d94e85b8..ab2312a1e2 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1253,7 +1253,12 @@ (define-public python-txtorcon (uri (pypi-uri "txtorcon" version)) (sha256 (base32 - "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p")))) + "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p")) + (modules '((guix build utils))) + (snippet + #~(substitute* "txtorcon/controller.py" + (("from collections import Sequence") + "from collections.abc import Sequence"))))) (build-system python-build-system) (arguments ;; The tests fail immediately due to a missing file. Reported upstream: From patchwork Sat May 13 16:59:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 49990 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 4C7B727BBEE; Sat, 13 May 2023 18:01: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 C320127BBE2 for ; Sat, 13 May 2023 18:01:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxscB-00076F-H0; Sat, 13 May 2023 13:01:03 -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 1pxscA-00075y-VW for guix-patches@gnu.org; Sat, 13 May 2023 13:01: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 1pxscA-0007IC-Jk for guix-patches@gnu.org; Sat, 13 May 2023 13:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxscA-0002AN-F7 for guix-patches@gnu.org; Sat, 13 May 2023 13:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63486] [PATCH 2/3] gnu: python-txtorcon: Run guix style. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 17:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63486@debbugs.gnu.org Cc: Juliana Sims Received: via spool by 63486-submit@debbugs.gnu.org id=B63486.16839972178241 (code B ref 63486); Sat, 13 May 2023 17:01:02 +0000 Received: (at 63486) by debbugs.gnu.org; 13 May 2023 17:00:17 +0000 Received: from localhost ([127.0.0.1]:39471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsbQ-00028g-Mp for submit@debbugs.gnu.org; Sat, 13 May 2023 13:00:17 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:38345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsbP-00028J-C4 for 63486@debbugs.gnu.org; Sat, 13 May 2023 13:00:15 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id DE68A6000D; Sat, 13 May 2023 17:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683997209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=adkdgqll+oKuCKSNKDTZs2eV+7TQq52VZEt/+qPL07A=; b=KzBcWZLS468zvg3qVyGSGlGcgjFiTImi11sr5thyLgo2du3pb4xob9h1RaZ/Mq4nznMzf0 c58Hr7RnF69ik7rGEYYDNcfYEN8r+kn5ofQc04+QCO5cJIsLn/T4tMz77hPLCZ44/uY5QP YFTXTcO4G9dZohtQYjT2DWOajG5VuHsi94byO0fQjQPHGCQKiPBf2huSfz1RIwS2TLWe+j 7TyKszb6QlsuwzQud/TsvDU07a+0N60Fe2h9OuEfJEMPxepkmlcTxl/C2athc50x6/xUIs iwKVdOKzNJUZK+s2Iur3FhkjlYF+OoVy+zCGpFKWb57h6RyF+FNKFBAGmTub1Q== From: Juliana Sims Date: Sat, 13 May 2023 12:59:47 -0400 Message-Id: <183c2901a0250f71ddf1d45ff8b45573a28bffda.1683996444.git.juli@incana.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/python-crypto.scm (python-txtorcon): Run guix style. --- gnu/packages/python-crypto.scm | 43 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index ab2312a1e2..8e94d54336 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1247,31 +1247,28 @@ (define-public python-txtorcon (package (name "python-txtorcon") (version "19.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "txtorcon" version)) - (sha256 - (base32 - "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p")) - (modules '((guix build utils))) - (snippet - #~(substitute* "txtorcon/controller.py" - (("from collections import Sequence") - "from collections.abc import Sequence"))))) + (source (origin + (method url-fetch) + (uri (pypi-uri "txtorcon" version)) + (sha256 + (base32 + "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p")) + (modules '((guix build utils))) + (snippet #~(substitute* "txtorcon/controller.py" + (("from collections import Sequence") + "from collections.abc import Sequence"))))) (build-system python-build-system) (arguments - ;; The tests fail immediately due to a missing file. Reported upstream: - ;; - `(#:tests? #f)) - (propagated-inputs - (list python-automat - python-idna - python-incremental - python-pyopenssl - python-service-identity - python-twisted - python-zope-interface)) + ;; The tests fail immediately due to a missing file. Reported upstream: + ;; + (list #:tests? #f)) + (propagated-inputs (list python-automat + python-idna + python-incremental + python-pyopenssl + python-service-identity + python-twisted + python-zope-interface)) (home-page "https://github.com/meejah/txtorcon") (synopsis "Twisted-based Tor controller client") (description "This package provides a Twisted-based Tor controller client, From patchwork Sat May 13 16:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 49991 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 A525D27BBEE; Sat, 13 May 2023 18:01:30 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 1224827BBE2 for ; Sat, 13 May 2023 18:01:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxscD-00076o-OL; Sat, 13 May 2023 13:01:05 -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 1pxscB-00076D-D5 for guix-patches@gnu.org; Sat, 13 May 2023 13:01: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 1pxscB-0007IK-49 for guix-patches@gnu.org; Sat, 13 May 2023 13:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxscA-0002AU-VZ for guix-patches@gnu.org; Sat, 13 May 2023 13:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63486] [PATCH 3/3] gnu: python-txtorcon: Update to 23.0.0. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 17:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63486@debbugs.gnu.org Cc: Juliana Sims Received: via spool by 63486-submit@debbugs.gnu.org id=B63486.16839972208255 (code B ref 63486); Sat, 13 May 2023 17:01:02 +0000 Received: (at 63486) by debbugs.gnu.org; 13 May 2023 17:00:20 +0000 Received: from localhost ([127.0.0.1]:39473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsbU-000295-79 for submit@debbugs.gnu.org; Sat, 13 May 2023 13:00:20 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:46273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsbQ-00028L-6o for 63486@debbugs.gnu.org; Sat, 13 May 2023 13:00:16 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id 15F9860007; Sat, 13 May 2023 17:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683997210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YhLckwmGkchbZIQq9NiSWyFnYPPRsqD5GbbXJ/BLFAA=; b=eo+944RJfG3V0q0UDBsX5W4j5lo34gf306HV6De8Tphzk77m3SHF1vVP5WR6izl+uFlhzw oU1MaUxkVp/V2dH3/kg5WI5Ind8RKA/QNivrhYpdQkRg/GTrPx4NDt/wsnncl5FDngzEJl sEGSqWA55QLpx/XeAyeOUnWGfC+x9TBaQYbF5UnJsLKj13hf3YgojE/F1F7K069x/mlgDy pdZTnimPuz4qONfJFhHD/fg+htV1NjdFlZ4+9l/VSJBmrM8ID9GZrUcdpCvLnT4xQ01Mm6 qBrrSz3odiJ2huUCowsT6oCv350H9hKBlaEgO86ls0hR71w1CL0WsrG7pfVKYQ== From: Juliana Sims Date: Sat, 13 May 2023 12:59:48 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/python-crypto.scm (python-txtorcon): Update to 23.0.0. --- gnu/packages/python-crypto.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 8e94d54336..712590ef4f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1246,22 +1246,33 @@ (define-public python-spake2 (define-public python-txtorcon (package (name "python-txtorcon") - (version "19.0.0") + (version "23.0.0") (source (origin (method url-fetch) (uri (pypi-uri "txtorcon" version)) (sha256 (base32 - "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p")) - (modules '((guix build utils))) - (snippet #~(substitute* "txtorcon/controller.py" - (("from collections import Sequence") - "from collections.abc import Sequence"))))) + "09a3k4g90pvs0q006ighka7xic39nnnk9bfrka23g4b8cynzy982")))) (build-system python-build-system) (arguments - ;; The tests fail immediately due to a missing file. Reported upstream: - ;; - (list #:tests? #f)) + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + ;; These tests fail + (substitute* "test/test_router.py" + (("\\W+def test_countrycode\\(self\\):" all) + (string-append + " from unittest import skip as _skip\n" + " @_skip('Fails during Guix build')\n" all)) + (("\\W+def test_get_location_private\\(self\\):" + all) + (string-append + " @_skip('Fails during Guix build')\n" all))) + ;; This test errors out + (substitute* "test/test_util.py" + (("\\W+def test_real_addr\\(self\\):" all) + (string-append + " @_skip('Fails during Guix build')\n" all)))))))) (propagated-inputs (list python-automat python-idna python-incremental @@ -1269,6 +1280,7 @@ (define-public python-txtorcon python-service-identity python-twisted python-zope-interface)) + (native-inputs (list python-mock)) (home-page "https://github.com/meejah/txtorcon") (synopsis "Twisted-based Tor controller client") (description "This package provides a Twisted-based Tor controller client,