From 6ee8b5316cad2fb960227e42f1379b895a6caf5f Mon Sep 17 00:00:00 2001
From: Juliana Sims <juli@incana.org>
Date: Sat, 13 May 2023 13:31:40 -0400
Subject: gnu: python-txtorcon: Update to 23.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-crypto.scm (python-txtorcon): Update to 23.0.0.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/python-crypto.scm | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'gnu/packages')

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 @@ Password-Authenticated Key Exchange algorithm.")
 (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
@@ -1270,6 +1281,7 @@ Password-Authenticated Key Exchange algorithm.")
                              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,
-- 
cgit v1.2.3

pan></td><td class='logsubject'><a href='/guix/commit/gnu/packages/popt.scm?id=de67e922885baf68a746a0484ca0b45e45b0964b'>gnu: Update URLs for sourceforge.net.</a></td><td>Leo Famulari</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/admin.scm: Update URLs pointing to sourceforge.net.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/boost.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/code.scm: Likewise.
* gnu/packages/compression.scm: Likewise.
* gnu/packages/cups.scm: Likewise.
* gnu/packages/djvu.scm: Likewise.
* gnu/packages/docbook.scm: Likewise.
* gnu/packages/documentation.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fonts.scm: Likewise.
* gnu/packages/fontutils.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/gl.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/graphviz.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/onc-rpc.scm: Likewise.
* gnu/packages/password-utils.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/photo.scm: Likewise.
* gnu/packages/popt.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/rdesktop.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/swig.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xml.scm: Likewise.


</td></tr>
<tr class='logheader'><td><span title='2016-06-15 15:34:58 +0200'>2016-06-15</span></td><td class='logsubject'><a href='/guix/commit/gnu/packages/popt.scm?id=ba6a996eacab58b1791feb69bc460777352d5039'>gnu: Add gengetopt.</a></td><td>Ricardo Wurmus</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/popt.scm (gengetopt): New variable.


</td></tr>
<tr class='logheader'><td><span title='2016-06-03 13:54:39 +0200'>2016-06-03</span></td><td class='logsubject'><a href='/guix/commit/gnu/packages/popt.scm?id=4b4e1b4b26a8ba56d57568ebd832a0ab8c1bf2a1'>gnu: Add gflags.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/popt.scm (gflags): New variable.


</td></tr>