From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 12:57:38 2023 Received: (at submit) by debbugs.gnu.org; 13 May 2023 16:57:38 +0000 Received: from localhost ([127.0.0.1]:39461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsYr-000225-Sl for submit@debbugs.gnu.org; Sat, 13 May 2023 12:57:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:49564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxsYq-00021y-6Z for submit@debbugs.gnu.org; Sat, 13 May 2023 12:57:36 -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 1pxsYq-0006e3-0C for guix-patches@gnu.org; Sat, 13 May 2023 12:57:36 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxsYm-0006Yb-Nr for guix-patches@gnu.org; Sat, 13 May 2023 12:57:35 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id CC447240003; Sat, 13 May 2023 16:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683997047; 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; bh=lR9JdLFt9ZnCBhCloHF+SmKQHGBXzMnJ+mHSeqATSsE=; b=coIWSOsF/M/I+Ng9muAlW6gV4dXjT4nk/rEDTJG7W1yxKviD5a2e8bsHAEgbM1bzcOLA0G /CYI8m2IwYMZ5bHjmebHrIRjcoPNQmDOMHTMf5wXh3xtklJpnwF28Y6aYH7pCeKeEIVl/2 xtiACQHwvaNmJ1ZhuaAIAeFmVh4lk9UKmp0+Hi8DGLBAxCD1uHg1CHkVs/LbhRGgwta81B RG+r47v89AcVseNQAGEMMW0LPHudCg3uM4KhgXm/nSm3MO/2SL/1/mz+ooePYjdxa3aWfJ b1ozfB7bUeNJ0m3QabohReVPOMteEWyGa9/+NXeOyvAzecZnKy15Pe1Oia4N/g== From: Juliana Sims To: guix-patches@gnu.org Subject: [PATCH 0/3] gnu: python-txtorcon: Fix build, style, update. Date: Sat, 13 May 2023 12:56:36 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.193; envelope-from=juli@incana.org; helo=relay1-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hello, This patch series does three things, each in its own patch. First, it fixes the failing build of python-txtorcon, which has the knock-on effect of fixing the failing build of magic-wormhole. Next, it styles python-txtorcon using `guix style'. Finally, it updates python-txtorcon to the upstream version 23.0.0. Thanks, Juli Juliana Sims (3): gnu: python-txtorcon: Fix failing build. gnu: python-txtorcon: Run guix style. gnu: python-txtorcon: Update to 23.0.0. gnu/packages/python-crypto.scm | 52 +++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 19 deletions(-) base-commit: ed1e7920393c9ae5b2ae31fc46bae88136239b13 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 13:00:16 2023 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 To: 63486@debbugs.gnu.org Subject: [PATCH 1/3] gnu: python-txtorcon: Fix failing build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63486 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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: -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 13:00:17 2023 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 To: 63486@debbugs.gnu.org Subject: [PATCH 2/3] gnu: python-txtorcon: Run guix style. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63486 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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, -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 13:00:20 2023 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 To: 63486@debbugs.gnu.org Subject: [PATCH 3/3] gnu: python-txtorcon: Update to 23.0.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63486 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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, -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 13:32:05 2023 Received: (at 63486) by debbugs.gnu.org; 13 May 2023 17:32:05 +0000 Received: from localhost ([127.0.0.1]:39525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxt6D-0005Ub-F7 for submit@debbugs.gnu.org; Sat, 13 May 2023 13:32:05 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:52623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxt6C-0005Tw-Cn for 63486@debbugs.gnu.org; Sat, 13 May 2023 13:32:05 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id B42E41BF203; Sat, 13 May 2023 17:31:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683999118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqJ7grcEq3eAlF8qY5dN+0XA7NjKvsKF6CQs+b3KBo0=; b=BLi/c6iEwN0P8qyseBatp18bvm8fHfTLL+e7/gv75rkKVxa0F3gLhqzL+8ajtmhwR4pvPL UWvFpbMjBVvhOC74W/5OKSZPe7krQyHWXpo1xtGaYHoRnHsGD3/aHzYlBGaCi1KASHwUrr qcMpTBPoBzFbJ815f/720utBvpVvtF2EOExPBZR7GCsuOSEeZUvV5GH1P9ks8UR5mkFuhk qrL9aNz02K7BmnFezQUvOKtTYbTlNK1ExIiC+uGCwCSSoAeyigEuM4G06Apk/JIZmtJIi3 E3SPg8/CMKA5Ix2B0LUZqai1KIIjliEB2c31HiVGuCHh0qHJAnDd0ghd8uIz3Q== From: Juliana Sims To: 63486@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: python-txtorcon: Fix failing build. Date: Sat, 13 May 2023 13:31:38 -0400 Message-Id: <93293536c55245718d7245b0334bc73d3609a96f.1683999057.git.juli@incana.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63486 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Oops, I forgot to add a copyright line - this version fixes that. * gnu/packages/python-crypto.scm (python-txtorcon): Fix failing build. --- gnu/packages/python-crypto.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b1d94e85b8..be3ab5d0be 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Antero Mejr +;;; Copyright © 2023 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -1253,7 +1254,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: base-commit: ed1e7920393c9ae5b2ae31fc46bae88136239b13 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 13:32:06 2023 Received: (at 63486) by debbugs.gnu.org; 13 May 2023 17:32:06 +0000 Received: from localhost ([127.0.0.1]:39527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxt6D-0005Ud-Qr for submit@debbugs.gnu.org; Sat, 13 May 2023 13:32:06 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:57471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxt6C-0005Ty-OP for 63486@debbugs.gnu.org; Sat, 13 May 2023 13:32:05 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id B34391BF204; Sat, 13 May 2023 17:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683999119; 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=vEOCBPVysvZhtbcLbiI9ddSWo67Wkmu7Gzu3sFwGGm4=; b=h+uBNzRXmTaqS769Q3Xmr+uTVijHPmXZyfFxmyVqKnVqb54C+rJQ0pvkNkf3k/iFGURusg rP+JQtDz/8QSvioSuRHcB+G9ocD+O6C0JZSs13EJZZ4lLwwHBoK84gJjr6lxxC1fprAmEd XmLJ1zXsl7mgvwqabLP2dod7Lj7eXFn1ob9eFwFZopXUY1s4KwY9WYSIBBU8z6sE7eBLaG eQWFmEO+orudjt1OOAGwSpkJ1vrfeM4HPAk3GxlLQ4CBoaD1DBT1lgrehJYMGg5+Pa4HIT ldP4IUKevITWo7wM4j75WQl416jNlfDZpNJLsnhy9HJwIps39yehXrRvBb/PrQ== From: Juliana Sims To: 63486@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: python-txtorcon: Run guix style. Date: Sat, 13 May 2023 13:31:39 -0400 Message-Id: <315ca05b2d8891ba02b29b47577986e082ea0d66.1683999057.git.juli@incana.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <93293536c55245718d7245b0334bc73d3609a96f.1683999057.git.juli@incana.org> References: <93293536c55245718d7245b0334bc73d3609a96f.1683999057.git.juli@incana.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63486 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 be3ab5d0be..6a7611ccdb 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1248,31 +1248,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, -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 13:32:09 2023 Received: (at 63486) by debbugs.gnu.org; 13 May 2023 17:32:09 +0000 Received: from localhost ([127.0.0.1]:39530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxt6H-0005V1-80 for submit@debbugs.gnu.org; Sat, 13 May 2023 13:32:09 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:37833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxt6D-0005U0-Pa for 63486@debbugs.gnu.org; Sat, 13 May 2023 13:32:06 -0400 Received: (Authenticated sender: juli@incana.org) by mail.gandi.net (Postfix) with ESMTPSA id B6C1D1BF207; Sat, 13 May 2023 17:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1683999120; 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=UowKYaB0beppFNBO+6WpGJid4k1TtOQ723nHyn3CkXY=; b=DVyr3JxDGWLeNrWL1PNnINENhNeQj3P8Ko90xOy5Fg0UaM0UpyBbVn8bmemLZNnOUQuFNg 5pB+pPvS8dvSxAD2Vcw/3DCGBv4mC0lcKSiEBRarFHPzCKmJhen1aTCx4VLig2dQhje+Gn cpSDOPi1s5KL7lvIZ5Oblvkk6r+J2UpxaB58cGgiKYA2IVnm+7X5+s4ayz8ZJss6oKx4Gj VB0XjSdsc4B2ZpZs1S0/JFa0B2A3lBCl1KW85KGk0u25nn3WVfFlQaFFR2pWns7EipFvk7 uNZQ2S9uBwZrFuzY3Wt+EVCC7YEpaK2//5eaoY6SMrWv2m5ytQcc4Jm9hUzo3g== From: Juliana Sims To: 63486@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: python-txtorcon: Update to 23.0.0. Date: Sat, 13 May 2023 13:31:40 -0400 Message-Id: <7f6623e8e17b3970ce4e4f46e7ea820d6c77289b.1683999057.git.juli@incana.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <93293536c55245718d7245b0334bc73d3609a96f.1683999057.git.juli@incana.org> References: <93293536c55245718d7245b0334bc73d3609a96f.1683999057.git.juli@incana.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63486 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 6a7611ccdb..7b2ac2db6e 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1247,22 +1247,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 @@ -1270,6 +1281,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, -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 22 10:54:43 2023 Received: (at 63486-done) by debbugs.gnu.org; 22 May 2023 14:54:43 +0000 Received: from localhost ([127.0.0.1]:35712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q16vq-0003kQ-Vd for submit@debbugs.gnu.org; Mon, 22 May 2023 10:54:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q16vo-0003kA-OM for 63486-done@debbugs.gnu.org; Mon, 22 May 2023 10:54:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q16vj-0001IW-28; Mon, 22 May 2023 10:54:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=jE414EV3Vct3FqiGAwIu3PfvBZiYwp9fG3IlDNTDZnU=; b=OJ0C4KWKQk6ToRfUQux7 wk4X8r0AKCKNllonduEIVw8vR3DOlKlJak+dMcwUBlp6PU90otQRvXSVP8LVDi3754dOKTunbo79c mriHvYGimxW2e4pBRGMoXHSaythGBjFFLBkTr633Fvu1CcHXK8J1YAreQjdGl9uRygB4iFuyALIpV Et0hqVA39N952ePhoDJEwZHKQmQ+ahJGDhLVr1i3d3bb+FTSbwNqcoYTJe0h5JU8dcoR3IuMckwe6 hmsNRmYTTfzqcP7Exti3lBpDkhy1PMttbyXzlNQEapewo+78ce6e2AU0hEdh01Wig4mVnCI/ZZHqA sBEga6MQH/fr2A==; Received: from [193.50.110.247] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q16vi-0001fW-LD; Mon, 22 May 2023 10:54:34 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Juliana Sims Subject: Re: bug#63486: [PATCH 0/3] gnu: python-txtorcon: Fix build, style, update. References: Date: Mon, 22 May 2023 16:54:32 +0200 In-Reply-To: (Juliana Sims's message of "Sat, 13 May 2023 12:56:36 -0400") Message-ID: <87v8gkwh5j.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63486-done Cc: 63486-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Juliana, Juliana Sims skribis: > gnu: python-txtorcon: Fix failing build. > gnu: python-txtorcon: Run guix style. > gnu: python-txtorcon: Update to 23.0.0. Applied v2, thanks! Ludo=E2=80=99. From unknown Sat Jun 21 03:24:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 20 Jun 2023 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator