unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Juliana Sims <juli@incana.org>
To: 63486@debbugs.gnu.org
Cc: Juliana Sims <juli@incana.org>
Subject: [bug#63486] [PATCH 3/3] gnu: python-txtorcon: Update to 23.0.0.
Date: Sat, 13 May 2023 12:59:48 -0400	[thread overview]
Message-ID: <d87c0c52c9cf4a5369c2f655ed70084efeb7c043.1683996444.git.juli@incana.org> (raw)
In-Reply-To: <cover.1683996444.git.juli@incana.org>

* 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:
-     ;; <https://github.com/meejah/txtorcon/issues/330>
-     (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





  parent reply	other threads:[~2023-05-13 17:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-13 16:56 [bug#63486] [PATCH 0/3] gnu: python-txtorcon: Fix build, style, update Juliana Sims
2023-05-13 16:59 ` [bug#63486] [PATCH 1/3] gnu: python-txtorcon: Fix failing build Juliana Sims
2023-05-13 16:59 ` [bug#63486] [PATCH 2/3] gnu: python-txtorcon: Run guix style Juliana Sims
2023-05-13 16:59 ` Juliana Sims [this message]
2023-05-13 17:31 ` [bug#63486] [PATCH v2 1/3] gnu: python-txtorcon: Fix failing build Juliana Sims
2023-05-13 17:31   ` [bug#63486] [PATCH v2 2/3] gnu: python-txtorcon: Run guix style Juliana Sims
2023-05-13 17:31   ` [bug#63486] [PATCH v2 3/3] gnu: python-txtorcon: Update to 23.0.0 Juliana Sims
2023-05-22 14:54 ` bug#63486: [PATCH 0/3] gnu: python-txtorcon: Fix build, style, update Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d87c0c52c9cf4a5369c2f655ed70084efeb7c043.1683996444.git.juli@incana.org \
    --to=juli@incana.org \
    --cc=63486@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).