From patchwork Sat May 13 17:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 49992 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 E4F0127BBE2; Sat, 13 May 2023 18:33:35 +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 1A9EE27BBEE for ; Sat, 13 May 2023 18:33:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxt7K-0002vm-4q; Sat, 13 May 2023 13:33:14 -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 1pxt79-0002uM-0H for guix-patches@gnu.org; Sat, 13 May 2023 13:33:04 -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 1pxt77-0004HW-OG for guix-patches@gnu.org; Sat, 13 May 2023 13:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxt77-0005WH-Jl for guix-patches@gnu.org; Sat, 13 May 2023 13:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63486] [PATCH v2 1/3] gnu: python-txtorcon: Fix failing build. References: In-Reply-To: Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 17:33:01 +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.168399912521122 (code B ref 63486); Sat, 13 May 2023 17:33:01 +0000 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 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 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 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(-) base-commit: ed1e7920393c9ae5b2ae31fc46bae88136239b13 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: From patchwork Sat May 13 17:31:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 49994 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 A2A6B27BBEE; Sat, 13 May 2023 18:33:41 +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 B085A27BBE2 for ; Sat, 13 May 2023 18:33:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxt7G-0002vM-T8; Sat, 13 May 2023 13:33:10 -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 1pxt79-0002uN-0s for guix-patches@gnu.org; Sat, 13 May 2023 13:33:04 -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 1pxt78-0004Ha-46 for guix-patches@gnu.org; Sat, 13 May 2023 13:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxt77-0005WO-Vg for guix-patches@gnu.org; Sat, 13 May 2023 13:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63486] [PATCH v2 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:33:01 +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.168399912621128 (code B ref 63486); Sat, 13 May 2023 17:33:01 +0000 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 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 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 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, From patchwork Sat May 13 17:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 49993 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 1CAB327BBEE; Sat, 13 May 2023 18:33:38 +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 6FC5C27BBE2 for ; Sat, 13 May 2023 18:33:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxt7M-0002w7-Hn; Sat, 13 May 2023 13:33:16 -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 1pxt79-0002uO-1A for guix-patches@gnu.org; Sat, 13 May 2023 13:33:04 -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 1pxt78-0004Hd-K6 for guix-patches@gnu.org; Sat, 13 May 2023 13:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxt78-0005WW-FT for guix-patches@gnu.org; Sat, 13 May 2023 13:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63486] [PATCH v2 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:33: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.168399912921147 (code B ref 63486); Sat, 13 May 2023 17:33:02 +0000 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 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 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 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,