GNU bug report logs - #75420
[PATCH python-team 00/11] Fix python-matrix-nio and pantalaimon builds.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75420 in the body.
You can then email your comments to 75420 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: guix-patches <at> gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 00/11] Fix python-matrix-nio and pantalaimon
 builds.
Date: Tue,  7 Jan 2025 14:56:54 +0100

Some dependencies of python-matrix-nio were updated, causing the build to
fail, which is fixed by updating it and related dependencies.  The latest
release of pantalaimon is quite old and not compatible with these versions, so
it is updated to the latest git version.

Arjan Adriaanse (11):
  gnu: Add python-expandvars.
  gnu: python-yarl: Update to 1.12.1.
  gnu: Add python-pytest-codspeed.
  gnu: Add python-aiohappyeyeballs.
  gnu: python-aiohttp: Update to 3.10.11.
  gnu: python-pytest-aiohttp: Update to 1.0.5.
  gnu: python-socks: Update to 2.4.4.
  gnu: python-aiohttp-socks: Update to 0.8.4.
  gnu: python-matrix-nio: Update to 0.25.1.
  gnu: python-platformdirs: Update to 4.3.6.
  gnu: pantalaimon: Update to 0.10.5-0.257ef6a.

 gnu/packages/matrix.scm       | 186 +++++++++++++------------------
 gnu/packages/python-check.scm |  44 +++++++-
 gnu/packages/python-web.scm   | 200 ++++++++++++++++------------------
 gnu/packages/python-xyz.scm   |  24 +++-
 4 files changed, 231 insertions(+), 223 deletions(-)


base-commit: 15da461807c56e912fd8402bf65255e4dc4ec830
-- 
2.46.0

Message #8 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 01/11] gnu: Add python-expandvars.
Date: Tue,  7 Jan 2025 15:09:12 +0100

* gnu/packages/python-xyz.scm (python-expandvars): New variable.

Change-Id: Ib6441555754189be7283e51873ef6306a6896294
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c0c3430088..dcc389da3d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -159,6 +159,7 @@
 ;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us <at> ieee.org>
 ;;; Copyright © 2024 Evgeny Pisemsky <mail <at> pisemsky.site>
 ;;; Copyright © 2024 Markku Korkeala <markku.korkeala <at> iki.fi>
+;;; Copyright © 2025 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11202,6 +11203,27 @@ (define-public python-executor
 particularly the AST node being executed.")
     (license license:expat))) ; MIT license
 
+(define-public python-expandvars
+  (package
+    (name "python-expandvars")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "expandvars" version))
+       (sha256
+        (base32 "0i6q4i8dzsax85w1l2hc7saymyh3fw43vkifh5flpkr8ayjxy6kx"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-hatchling
+           python-pytest))
+    (home-page "https://github.com/sayanarijit/expandvars")
+    (synopsis "Expand system variables Unix style")
+    (description "@code{expandvars} is inspired by GNU bash's variable
+expansion features.  It can be used as an alternative to Python's
+@code{os.path.expandvars} function.")
+    (license license:expat)))
+
 (define-public python-roifile
   (package
     (name "python-roifile")
-- 
2.46.0

Message #11 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 02/11] gnu: python-yarl: Update to 1.12.1.
Date: Tue,  7 Jan 2025 15:09:13 +0100

* gnu/packages/python-web.scm (python-yarl): Update to 1.12.1.

Change-Id: Ia35413c952042ce81eaac3ba10e90b4b333e8386
---
 gnu/packages/python-web.scm | 43 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index de6a2b91ae..56e2d2aa39 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -69,6 +69,7 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Spencer King <spencer.king <at> geneoscopy.com>
 ;;; Copyright © 2024 Attila Lendvai <attila <at> lendvai.name>
+;;; Copyright © 2025 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6103,35 +6104,35 @@ (define-public python-pycares
 (define-public python-yarl
   (package
     (name "python-yarl")
-    (version "1.6.3")
+    (version "1.12.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "yarl" version))
        (sha256
-        (base32
-         "045z4ssg8g5h0qhz8hnx74hswgkndaldqq1xi5l1n5s0j996d44a"))
-       (modules '((guix build utils)))
-       (snippet
-         #~(begin
-             (delete-file "yarl/_quoting_c.c")))))
-    (build-system python-build-system)
+        (base32 "0a2qh676xlpzb40an2m5k2hnql6fjr8krvnwwipqvv4s35ah11jv"))))
+    (build-system pyproject-build-system)
     (arguments
-      (list #:tests? #f     ; test suite can't find yarl._quoting_c
-            #:phases
+      (list #:phases
             #~(modify-phases %standard-phases
-                (add-after 'unpack 'cythonize-code
+                (add-after 'unpack 'force-build-inplace
                   (lambda _
-                    (invoke "cython" "yarl/_quoting_c.pyx")))
-                (replace 'check
-                  (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-                    (when tests?
-                      (substitute* "setup.cfg"
-                        (("--cov=yarl") ""))
-                      (add-installed-pythonpath inputs outputs)
-                      (invoke "python" "-m" "pytest")))))))
-    (native-inputs
-     (list python-cython python-pytest python-pytest-runner))
+                    ;; This makes sure the resulting wheel ends up in a
+                    ;; location where it can be found for installing.
+                    (substitute* "packaging/pep517_backend/_backend.py"
+                      (("build_inplace=False")
+                       "build_inplace=True"))
+                    #t)))))
+    (native-inputs
+     (list python-covdefaults
+           python-cython
+           python-expandvars
+           python-pytest
+           python-pytest-cov
+           python-pytest-xdist
+           python-setuptools
+           python-tomli
+           python-wheel))
     (propagated-inputs
      (list python-idna python-multidict))
     (home-page "https://github.com/aio-libs/yarl/")
-- 
2.46.0

Message #14 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 03/11] gnu: Add python-pytest-codspeed.
Date: Tue,  7 Jan 2025 15:09:14 +0100

* gnu/packages/python-check.scm (python-pytest-codspeed): New variable.

Change-Id: Ib6937eca74d98ce1bdbd9c9053394a537107825b
---
 gnu/packages/python-check.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index e8efb96f5f..1e6debc937 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2024 Navid Afkhami <navid.afkhami <at> mdc-berlin.de>
 ;;; Copyright © 2024 David Elsing <david.elsing <at> posteo.net>
 ;;; Copyright © 2024 Eric Bavier <bavier <at> posteo.net>
+;;; Copyright © 2025 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,6 +49,7 @@ (define-module (gnu packages python-check)
   #:use-module (gnu packages django)
   #:use-module (gnu packages docker)
   #:use-module (gnu packages jupyter)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages openstack)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python-build)
@@ -188,6 +190,34 @@ (define-public python-pytest-click
 interfaces with pytest.")
     (license license:expat)))
 
+(define-public python-pytest-codspeed
+  (package
+    (name "python-pytest-codspeed")
+    (version "2.2.1")
+    (source
+     (origin
+       ;; No tests in the PyPI tarball.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/CodSpeedHQ/pytest-codspeed")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0phjjg4ncjgq7j8fvchyag92qx4xvxjw33rkb50admipkz38sbzh"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-cffi
+           python-pytest))
+    (native-inputs
+     (list python-hatchling
+           python-filelock
+           python-pytest
+           python-pytest-cov))
+    (home-page "https://codspeed.io")
+    (synopsis "Pytest plugin to create CodSpeed benchmarks")
+    (description "Pytest plugin to create @code{CodSpeed} benchmarks.")
+    (license license:expat)))
+
 (define-public python-pytest-cram
   (package
     (name "python-pytest-cram")
-- 
2.46.0

Message #17 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 04/11] gnu: Add python-aiohappyeyeballs.
Date: Tue,  7 Jan 2025 15:09:15 +0100

* gnu/packages/python-web.scm (python-aiohappyeyeballs): New variable.

Change-Id: I7753327674b667c44e314d055b9d58f3097cb71b
---
 gnu/packages/python-web.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 56e2d2aa39..15c43691d5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -791,6 +791,29 @@ (define-public python-aiohttp
 @end itemize")
     (license license:asl2.0)))
 
+(define-public python-aiohappyeyeballs
+  (package
+    (name "python-aiohappyeyeballs")
+    (version "2.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "aiohappyeyeballs" version))
+       (sha256
+        (base32 "0ibpfm552pflim399qq34cnd79xhz5qr5khqzhx1hqwwi23pvpaz"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-poetry-core
+           python-pytest
+           python-pytest-asyncio
+           python-pytest-cov))
+    (home-page "https://github.com/aio-libs/aiohappyeyeballs")
+    (synopsis "Happy Eyeballs for asyncio")
+    (description "@code{aiohappyeyeballs} allows connecting with Happy
+Eyeballs (RFC 8305) when you already have a list of @code{addrinfo} and not a
+DNS name.")
+    (license license:psfl)))
+
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-- 
2.46.0

Message #20 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 05/11] gnu: python-aiohttp: Update to 3.10.11.
Date: Tue,  7 Jan 2025 15:09:16 +0100

* gnu/packages/python-web.scm (python-aiohttp): Update to 3.10.11.

Change-Id: Icbc68e14192af07f0c5785721e68afb52b61ce33
---
 gnu/packages/python-web.scm | 115 +++++++++++-------------------------
 1 file changed, 34 insertions(+), 81 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 15c43691d5..a5371ef601 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -669,114 +669,67 @@ (define-public python-aiosignal
 (define-public python-aiohttp
   (package
     (name "python-aiohttp")
-    (version "3.8.4")
+    (version "3.10.11")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp" version))
        (sha256
-        (base32 "0p5bj6g7ca19gvwk8fz00k579ma9w9kd27ssh2zl3r61ca8ilbmz"))
-       (snippet
-        #~(begin
-            (use-modules ((guix build utils)))
-            ;; TODO: Unbundle the llhttp sources.
-            ;; (delete-file-recursively "vendor")
-            (delete-file "aiohttp/_helpers.c")
-            (delete-file "aiohttp/_http_parser.c")
-            (delete-file "aiohttp/_http_writer.c")
-            (delete-file "aiohttp/_websocket.c")))))
-    (build-system python-build-system)
+        (base32 "19rk9n9293r8sdqilpxj9brycm9v1jjqv71hzbh3jbmbvkrvihlx"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'fix-tests
-           (lambda _
-             ;; Disable brotli tests, because we’re not providing that
-             ;; optional library.
-             (substitute* "tests/test_http_parser.py"
-               (("    async def test_feed_eof_no_err_brotli")
-                "    @pytest.mark.xfail\n    async def test_feed_eof_no_err_brotli"))
-             ;; Make sure the timestamp of this file is > 1990, because a few
-             ;; tests like test_static_file_if_modified_since_past_date depend
-             ;; on it.
-             (let ((late-90s (* 60 60 24 365 30)))
-               (utime "tests/data.unknown_mime_type" late-90s late-90s))
-
-             ;; Disable test that attempts to access httpbin.org.
-             (substitute* "tests/test_formdata.py"
-               (("async def test_mark_formdata_as_processed.*" all)
-                (string-append "@pytest.mark.xfail\n" all)))
-
-             ;; Don't test the aiohttp pytest plugin to avoid a dependency loop.
-             (delete-file "tests/test_pytest_plugin.py")))
-         (add-before 'build 'cythonize
-           (lambda _
-             ;; Adapted from the Makefile.
-             (with-directory-excursion "aiohttp"
-               (for-each
-                (lambda (file)
-                  (invoke "cython" "-3"
-                          file "-I" "."))
-                (find-files "." "_.*\\.pyx$")))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (let ((skipped-tests
-                     (string-append
-                       ;; This test probably requires to be run with the
-                       ;; library loaded from the the build directory.
-                       "not test_c_parser_loaded and "
-                       ;; TODO: These tests fail with recent versions of Pytest
-                       ;; and the fix is difficult to backport:
-                       ;; https://github.com/aio-libs/aiohttp/pull/6872
-                       ;; Re-enable after 3.9.
-                       "not test_session_close_awaitable and "
-                       "not test_async_with_session and "
-                       "not test_close_run_until_complete_not_deprecated and "
-                       ;; Disable the following tests as they require
-                       ;; networking.
-                       "not TestDeflateBuffer and "
-                       "not test_client_session_timeout_zero and "
-                       "not test_empty_body and "
-                       "not test_mark_formdata_as_processed[pyloop] and "
-                       "not test_receive_runtime_err[pyloop] "
-                       ;; These tests fail for unknown reasons (see:
-                       ;; https://github.com/aio-libs/aiohttp/issues/7130)
-                       "and not test_no_warnings "
-                       "and not test_default_loop "
-                       "and not test_ctor_global_loop "
-                       "and not test_set_loop_default_loop ")))
+                    (string-append
+                     ;; Disable the following tests as they require
+                     ;; networking.
+                     "not test_host_header_ipv6[pyloop-True] and "
+                     "not test_http_response_parser_strict_obs_line_folding[py-parser-pyloop] and "
+                     "not test_http_response_parser_strict_obs_line_folding[c-parser-pyloop] and "
+                     "not test_http_response_parser_strict_headers[c-parser-pyloop] and "
+                     "not test_http_response_parser_bad_chunked_strict_py[pyloop] and "
+                     "not test_http_response_parser_bad_chunked_strict_c[pyloop] and "
+                     "not test_add_static_path_resolution "
+                     ;; These tests fail for unknown reasons (see:
+                     ;; https://github.com/aio-libs/aiohttp/issues/7130)
+                     "and not test_no_warnings "
+                     "and not test_default_loop "
+                     "and not test_ctor_global_loop "
+                     "and not test_set_loop_default_loop "
+                     ;; This test depends on timing which makes it unstable.
+                     "and not test_import_time ")))
                (when tests?
-                 ;; This tests requires the 'proxy.py' module, not yet
-                 ;; packaged.
-                 (delete-file "tests/test_proxy_functional.py")
                  ;; Sometimes tests fail when run in parallel.
                  (invoke "pytest" "-vv"
                          "-o" "addopts=''" "--ignore=aiohttp"
-                         ;; These tests cause errors (see:
-                         ;; https://github.com/aio-libs/aiohttp/issues/7130).
-                         "--ignore" "tests/test_web_sendfile_functional.py"
-                         "--ignore" "tests/test_web_urldispatcher.py"
+                         ;; These tests require the 'proxy.py' module, not yet
+                         ;; packaged.
+                         "--ignore" "tests/test_proxy_functional.py"
+                         ;; These tests require Docker.
+                         "--ignore" "tests/autobahn/test_autobahn.py"
                          "-k" skipped-tests))))))))
     (propagated-inputs
      (list python-aiodns
+           python-aiohappyeyeballs
            python-aiosignal
-           python-attrs
-           python-asynctest
            python-async-timeout
-           python-charset-normalizer
+           python-attrs
+           python-brotli
            python-frozenlist
-           python-idna-ssl
            python-multidict
            python-yarl))
     (native-inputs
-     (list gunicorn-bootstrap
-           python-async-generator
-           python-cython
+     (list python-filelock
            python-freezegun
            python-pytest
+           python-pytest-codspeed
            python-pytest-mock
-           python-pytest-xdist
-           python-re-assert))
+           python-re-assert
+           python-setuptools
+           python-wheel))
     (home-page "https://github.com/aio-libs/aiohttp/")
     (synopsis "Async HTTP client/server framework (asyncio)")
     (description "@code{aiohttp} is an asynchronous HTTP client/server
-- 
2.46.0

Message #23 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 06/11] gnu: python-pytest-aiohttp: Update to 1.0.5.
Date: Tue,  7 Jan 2025 15:09:17 +0100

* gnu/packages/python-check.scm (python-pytest-aiohttp): Update to 1.0.5.

Change-Id: Iea59c16220f28fa7c4cdd25f1cf05719ecec8733
---
 gnu/packages/python-check.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 1e6debc937..50601c5312 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1741,19 +1741,23 @@ (define-public python-pytest-toolbox
 (define-public python-pytest-aiohttp
   (package
     (name "python-pytest-aiohttp")
-    (version "0.3.0")
+    (version "1.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest-aiohttp" version))
        (sha256
-        (base32
-         "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"))))
+        (base32 "02kq1bqsy9dlm9qckfiy9myizwcqna5szqqm7d339saib6y640l8"))))
     (build-system python-build-system)
     (native-inputs
-     (list python-pytest))
+     (list python-coverage
+           python-mypy
+           python-setuptools-scm
+           python-wheel))
     (propagated-inputs
-     (list python-aiohttp))
+     (list python-aiohttp
+           python-pytest
+           python-pytest-asyncio))
     (home-page "https://github.com/aio-libs/pytest-aiohttp/")
     (synopsis "Pytest plugin for aiohttp support")
     (description "This package provides a pytest plugin for aiohttp support.")
-- 
2.46.0

Message #26 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 07/11] gnu: python-socks: Update to 2.4.4.
Date: Tue,  7 Jan 2025 15:09:18 +0100

* gnu/packages/python-web.scm (python-socks): Update to 2.4.4.

Change-Id: I74fb7fee7432c183ac513c7157c55eb4d8b74794
---
 gnu/packages/python-web.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a5371ef601..aacfd12ed6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8416,14 +8416,14 @@ (define-public python-socketio
 (define-public python-socks
   (package
     (name "python-socks")
-    (version "2.0.3")
+    (version "2.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-socks" version))
        (sha256
         (base32
-         "12msk06c0glljcrx1byd78xgv05lxw81vknqwhn8ccs7an7cmag3"))))
+         "0bnj78kapsd13wigx2a3l1jkk54qggcarzj6760jqq83hbvy9a75"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f                      ; tests not included
@@ -8434,7 +8434,10 @@ (define-public python-socks
              (when tests?
                (invoke "pytest" "tests/" "-s")))))))
     (propagated-inputs
-     (list python-async-timeout python-curio python-trio))
+     (list python-anyio
+           python-async-timeout
+           python-curio
+           python-trio))
     (native-inputs
      (list python-pytest))
     (home-page "https://github.com/romis2012/python-socks")
-- 
2.46.0

Message #29 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 08/11] gnu: python-aiohttp-socks: Update to 0.8.4.
Date: Tue,  7 Jan 2025 15:09:19 +0100

* gnu/packages/python-web.scm (python-aiohttp-socks): Update to 0.8.4.

Change-Id: I85135525dd21a2076365b1a7a319b42d3ffcfa35
---
 gnu/packages/python-web.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index aacfd12ed6..ab2bca81ca 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -770,17 +770,21 @@ (define-public python-aiohappyeyeballs
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.7.1")
+    (version "0.8.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "06il43dv6qm858af841vq9qadw6h7qsfs06nnwagmwqyi72cl592"))))
+         "1d3clhfj01knfk2mvafblqj4ij3w8jx0sppd5wnczs9qx161sqbb"))))
     (build-system python-build-system)
+    (native-inputs
+     (list nss-certs-for-test
+           python-wheel))
     (propagated-inputs
-     (list python-aiohttp python-attrs python-socks))
+     (list python-aiohttp
+           python-socks))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.46.0

Message #32 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 09/11] gnu: python-matrix-nio: Update to 0.25.1.
Date: Tue,  7 Jan 2025 15:09:20 +0100

* gnu/packages/matrix.scm (python-matrix-nio): Update to 0.25.1.

Change-Id: I959818595a17a6bbc423d0c083feea039698fed7
---
 gnu/packages/matrix.scm | 65 ++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 32ae62fcb4..a65e3b0143 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev <at> posteo.org>
 ;;; Copyright © 2022 Morgan Smith <Morgan.J.Smith <at> outlook.com>
+;;; Copyright © 2025 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -160,78 +161,50 @@ (define-public synapse
 (define-public python-matrix-nio
   (package
     (name "python-matrix-nio")
-    (version "0.20.2")
+    (version "0.25.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "matrix_nio" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/matrix-nio/matrix-nio")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "110wg1grhqqgwvlgr98r2k8wxcggpj7lbdwmgkgmi2l7qj1vw3dm"))))
+        (base32 "0fmy2qaa7cpp6qk4ilwik2jrszk36c86l5haxvwgyp009pz4rz3i"))))
     (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'relax-requirements
-           (lambda _
-             (substitute* "pyproject.toml"
-               ;; Remove upper bounds of cachetool pin.
-               (("cachetools (.*version = )\"\\^4" _ match)
-                (string-append "cachetools " match
-                               "\">=4")))))
-         (add-before 'check 'install-tests
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (copy-recursively (string-append
-                                (assoc-ref inputs "tests") "/tests")
-                               "tests")
-             #t))
          (replace 'check
            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
              (when tests?
                (add-installed-pythonpath inputs outputs)
-               ;; FIXME: two tests fail, for unknown reasons
                (invoke "python" "-m" "pytest" "-vv" "tests" "-k"
-                       (string-append
-                        "not test_upload_binary_file_object "
-                        "and not test_connect_wrapper"))))))))
+                       ;; This test requires networking.
+                       "not test_connect_wrapper")))))))
     (native-inputs
-     `(("python-pytest" ,python-pytest)
-       ("python-poetry-core" ,python-poetry-core)
-       ("python-hypothesis" ,python-hypothesis)
-       ("python-faker" ,python-faker)
-       ("python-pytest-aiohttp" ,python-pytest-aiohttp)
-       ("python-pytest-asyncio" ,python-pytest-asyncio)
-       ("python-aioresponses" ,python-aioresponses)
-       ("python-pytest-benchmark" ,python-pytest-benchmark)
-       ("tests"
-        ;; The release on pypi comes without tests.  We can't build from this
-        ;; checkout, though, because installation requires an invocation of
-        ;; poetry.
-        ,(origin
-           (method git-fetch)
-           (uri (git-reference
-                 (url "https://github.com/poljar/matrix-nio.git")
-                 (commit version)))
-           (file-name (git-file-name name version))
-           (sha256
-            (base32
-             "1rd90sk5yygxzvcs4qhzr80bch7d3xszyfjf99pn10xsj10mi752"))))))
+     (list python-aioresponses
+           python-faker
+           python-hypothesis
+           python-pytest
+           python-pytest-aiohttp
+           python-pytest-asyncio
+           python-pytest-benchmark
+           python-wheel))
     (propagated-inputs
      (list python-aiofiles
            python-aiohttp
            python-aiohttp-socks
            python-atomicwrites
            python-cachetools
-           python-dataclasses
-           python-future
            python-h11
            python-h2
            python-jsonschema
-           python-logbook
            python-olm
            python-peewee
            python-pycryptodome
            python-unpaddedbase64))
-    (home-page "https://github.com/poljar/matrix-nio")
+    (home-page "https://github.com/matrix-nio/matrix-nio")
     (synopsis
      "Python Matrix client library, designed according to sans I/O principles")
     (description
-- 
2.46.0

Message #35 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 10/11] gnu: python-platformdirs: Update to 4.3.6.
Date: Tue,  7 Jan 2025 15:09:21 +0100

* gnu/packages/python-xyz.scm (python-platformdirs): Update to 4.3.6.

Change-Id: Ie2d5d3c6ced90583f3e7740cfed1b05c7204b07b
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index dcc389da3d..b74fce3b83 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -36650,7 +36650,7 @@ (define-public python-platformdirs
            python-pytest
            python-pytest-cov
            python-pytest-mock))
-    (home-page "https://github.com/platformdirs/platformdirs")
+    (home-page "https://github.com/tox-dev/platformdirs")
     (synopsis "Determine the appropriate platform-specific directories")
     (description "When writing applications, finding the right location to
 store user data and configuration varies per platform.  Even for
-- 
2.46.0

Message #38 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team 11/11] gnu: pantalaimon: Update to
 0.10.5-0.257ef6a.
Date: Tue,  7 Jan 2025 15:15:43 +0100

* gnu/packages/matrix.scm (pantalaimon): Update to 0.10.5-0.257ef6a.

Change-Id: Ie2ccb3263f41193e504184157d3a4be301ddacbf
---
 gnu/packages/matrix.scm | 121 +++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index a65e3b0143..afdbcfc14c 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -214,69 +214,64 @@ (define-public python-matrix-nio
     (license license:isc)))
 
 (define-public pantalaimon
-  (package
-    (name "pantalaimon")
-    (version "0.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/matrix-org/pantalaimon")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68"))))
-    (build-system python-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'downgrade-appdirs-requirement
-            (lambda _
-              (substitute* "setup.py"
-                ;; FIXME: Remove this once appdirs is updated.
-                ;; Upgrading python-appdirs requires rebuilting 3000+ packages,
-                ;; when 1.4.4 is a simple maintenance fix from 1.4.3.
-                (("appdirs >= 1.4.4") "appdirs >= 1.4.3"))))
-          (add-after 'install 'install-doc
-            (lambda _
-              (with-directory-excursion "docs/man"
-                (let ((man (string-append #$output "/share/man")))
-                  (install-file "panctl.1" (string-append man "/man1"))
-                  (install-file "pantalaimon.5" (string-append man "/man5"))
-                  (install-file "pantalaimon.8" (string-append man "/man8"))))))
-          (replace 'check
-            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-              (when tests?
-                (add-installed-pythonpath inputs outputs)
-                (invoke "pytest" "-vv" "tests")))))))
-    (native-inputs
-     (list python-aioresponses
-           python-faker
-           python-pytest
-           python-pytest-aiohttp))
-    (propagated-inputs
-     (list python-aiohttp
-           python-appdirs
-           python-attrs
-           python-cachetools
-           python-click
-           python-dbus
-           python-janus
-           python-keyring
-           python-logbook
-           python-matrix-nio
-           python-notify2
-           python-peewee
-           python-prompt-toolkit
-           python-pydbus
-           python-pygobject))
-    (home-page "https://github.com/matrix-org/pantalaimon")
-    (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
-    (description
-     "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
+  (let ((commit "257ef6a2e5e5668cd43347037c09ba036f91d997")
+        (revision "0"))
+    (package
+      (name "pantalaimon")
+      (version (git-version "0.10.5" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/matrix-org/pantalaimon")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1i18mjlc143d2xwlha09i5ny06vipmy8fii05427zq5vjz8rysgx"))))
+      (build-system python-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'install 'install-doc
+              (lambda _
+                (with-directory-excursion "docs/man"
+                  (let ((man (string-append #$output "/share/man")))
+                    (install-file "panctl.1" (string-append man "/man1"))
+                    (install-file "pantalaimon.5" (string-append man "/man5"))
+                    (install-file "pantalaimon.8" (string-append man "/man8"))))))
+            (replace 'check
+              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                (when tests?
+                  (add-installed-pythonpath inputs outputs)
+                  (invoke "pytest" "-vv" "tests")))))))
+      (native-inputs
+       (list python-aioresponses
+             python-faker
+             python-pytest
+             python-pytest-aiohttp
+             python-pytest-asyncio))
+      (propagated-inputs
+       (list python-aiohttp
+             python-attrs
+             python-cachetools
+             python-click
+             python-dbus
+             python-janus
+             python-keyring
+             python-logbook
+             python-matrix-nio
+             python-notify2
+             python-peewee
+             python-platformdirs
+             python-prompt-toolkit
+             python-pydbus
+             python-pygobject))
+      (home-page "https://github.com/matrix-org/pantalaimon")
+      (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
+      (description
+       "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
 daemon.  Pantalaimon acts as a good man in the middle that handles the
 encryption for you.  Messages are transparently encrypted and decrypted for
 clients inside of pantalaimon.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))
-- 
2.46.0

Message #41 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team v2] gnu: pantalaimon: Update to 0.10.5-0.257ef6a.
Date: Mon, 13 Jan 2025 11:48:38 +0100

* gnu/packages/matrix.scm (pantalaimon): Update to 0.10.5-0.257ef6a.
[arguments]<#:phases>: Change requirements, skip hanging tests.
[native-inputs]: Add python-pytest-asyncio.
[propagated-inputs]: Replace python-appdirs with python-platformdirs.

Change-Id: Ie2ccb3263f41193e504184157d3a4be301ddacbf
---

The previous version was based on an outdated revision, but all of the
dependendies have already been updated.  This version only consists of
the pantalaimon update.

gnu/packages/matrix.scm | 130 +++++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 8d1aca4b2e..ef86c038ce 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -226,69 +226,73 @@ (define-public python-matrix-nio
     (license license:isc)))
 
 (define-public pantalaimon
-  (package
-    (name "pantalaimon")
-    (version "0.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/matrix-org/pantalaimon")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68"))))
-    (build-system python-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'downgrade-appdirs-requirement
-            (lambda _
-              (substitute* "setup.py"
-                ;; FIXME: Remove this once appdirs is updated.
-                ;; Upgrading python-appdirs requires rebuilting 3000+ packages,
-                ;; when 1.4.4 is a simple maintenance fix from 1.4.3.
-                (("appdirs >= 1.4.4") "appdirs >= 1.4.3"))))
-          (add-after 'install 'install-doc
-            (lambda _
-              (with-directory-excursion "docs/man"
-                (let ((man (string-append #$output "/share/man")))
-                  (install-file "panctl.1" (string-append man "/man1"))
-                  (install-file "pantalaimon.5" (string-append man "/man5"))
-                  (install-file "pantalaimon.8" (string-append man "/man8"))))))
-          (replace 'check
-            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-              (when tests?
-                (add-installed-pythonpath inputs outputs)
-                (invoke "pytest" "-vv" "tests")))))))
-    (native-inputs
-     (list python-aioresponses
-           python-faker
-           python-pytest
-           python-pytest-aiohttp))
-    (propagated-inputs
-     (list python-aiohttp
-           python-appdirs
-           python-attrs
-           python-cachetools
-           python-click
-           python-dbus
-           python-janus
-           python-keyring
-           python-logbook
-           python-matrix-nio
-           python-notify2
-           python-peewee
-           python-prompt-toolkit
-           python-pydbus
-           python-pygobject))
-    (home-page "https://github.com/matrix-org/pantalaimon")
-    (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
-    (description
-     "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
+  (let ((commit "257ef6a2e5e5668cd43347037c09ba036f91d997")
+        (revision "0"))
+    (package
+      (name "pantalaimon")
+      (version (git-version "0.10.5" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/matrix-org/pantalaimon")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1i18mjlc143d2xwlha09i5ny06vipmy8fii05427zq5vjz8rysgx"))))
+      (build-system python-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'relax-requirements
+              (lambda _
+                (substitute* "setup.py"
+                  ;; Newer version is packaged.
+                  (("\"matrix-nio\\[e2e\\] >= 0\\.24, < 0\\.25\\.2\"")
+                   "\"matrix-nio[e2e] >= 0.24, <= 0.25.2\""))))
+            (add-after 'install 'install-doc
+              (lambda _
+                (with-directory-excursion "docs/man"
+                  (let ((man (string-append #$output "/share/man")))
+                    (install-file "panctl.1" (string-append man "/man1"))
+                    (install-file "pantalaimon.5" (string-append man "/man5"))
+                    (install-file "pantalaimon.8" (string-append man "/man8"))))))
+            (replace 'check
+              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                (when tests?
+                  (add-installed-pythonpath inputs outputs)
+                  (invoke "pytest" "-vv" "tests"
+                          ;; These tests hang.
+                          "--ignore=tests/proxy_test.py"
+                          "-k" "not test_start_loop")))))))
+      (native-inputs
+       (list python-aioresponses
+             python-faker
+             python-pytest
+             python-pytest-aiohttp
+             python-pytest-asyncio))
+      (propagated-inputs
+       (list python-aiohttp
+             python-attrs
+             python-cachetools
+             python-click
+             python-dbus
+             python-janus
+             python-keyring
+             python-logbook
+             python-matrix-nio
+             python-notify2
+             python-peewee
+             python-platformdirs
+             python-prompt-toolkit
+             python-pydbus
+             python-pygobject))
+      (home-page "https://github.com/matrix-org/pantalaimon")
+      (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
+      (description
+       "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
 daemon.  Pantalaimon acts as a good man in the middle that handles the
 encryption for you.  Messages are transparently encrypted and decrypted for
 clients inside of pantalaimon.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))

base-commit: 7da088166d03859ccc69d65748c708caa0cbd2e8
-- 
2.47.1

Message #44 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: 75420 <at> debbugs.gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH python-team v3] gnu: pantalaimon: Update to 0.10.5-0.257ef6a.
Date: Mon, 13 Jan 2025 11:57:47 +0100

* gnu/packages/matrix.scm (pantalaimon): Update to 0.10.5-0.257ef6a.
[arguments]<#:phases>: Change requirements, skip hanging tests.
[native-inputs]: Add python-pytest-asyncio.
[propagated-inputs]: Replace python-appdirs with python-platformdirs.

Change-Id: Ie2ccb3263f41193e504184157d3a4be301ddacbf
---

I forgot to include the copyright notice from the initial version.

gnu/packages/matrix.scm | 131 +++++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 8d1aca4b2e..be3edae0dc 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev <at> posteo.org>
 ;;; Copyright © 2022 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2025 Ricardo Wurmus <rekado <at> elephly.net>
+;;; Copyright © 2025 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -226,69 +227,73 @@ (define-public python-matrix-nio
     (license license:isc)))
 
 (define-public pantalaimon
-  (package
-    (name "pantalaimon")
-    (version "0.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/matrix-org/pantalaimon")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68"))))
-    (build-system python-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'downgrade-appdirs-requirement
-            (lambda _
-              (substitute* "setup.py"
-                ;; FIXME: Remove this once appdirs is updated.
-                ;; Upgrading python-appdirs requires rebuilting 3000+ packages,
-                ;; when 1.4.4 is a simple maintenance fix from 1.4.3.
-                (("appdirs >= 1.4.4") "appdirs >= 1.4.3"))))
-          (add-after 'install 'install-doc
-            (lambda _
-              (with-directory-excursion "docs/man"
-                (let ((man (string-append #$output "/share/man")))
-                  (install-file "panctl.1" (string-append man "/man1"))
-                  (install-file "pantalaimon.5" (string-append man "/man5"))
-                  (install-file "pantalaimon.8" (string-append man "/man8"))))))
-          (replace 'check
-            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-              (when tests?
-                (add-installed-pythonpath inputs outputs)
-                (invoke "pytest" "-vv" "tests")))))))
-    (native-inputs
-     (list python-aioresponses
-           python-faker
-           python-pytest
-           python-pytest-aiohttp))
-    (propagated-inputs
-     (list python-aiohttp
-           python-appdirs
-           python-attrs
-           python-cachetools
-           python-click
-           python-dbus
-           python-janus
-           python-keyring
-           python-logbook
-           python-matrix-nio
-           python-notify2
-           python-peewee
-           python-prompt-toolkit
-           python-pydbus
-           python-pygobject))
-    (home-page "https://github.com/matrix-org/pantalaimon")
-    (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
-    (description
-     "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
+  (let ((commit "257ef6a2e5e5668cd43347037c09ba036f91d997")
+        (revision "0"))
+    (package
+      (name "pantalaimon")
+      (version (git-version "0.10.5" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/matrix-org/pantalaimon")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1i18mjlc143d2xwlha09i5ny06vipmy8fii05427zq5vjz8rysgx"))))
+      (build-system python-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'relax-requirements
+              (lambda _
+                (substitute* "setup.py"
+                  ;; Newer version is packaged.
+                  (("\"matrix-nio\\[e2e\\] >= 0\\.24, < 0\\.25\\.2\"")
+                   "\"matrix-nio[e2e] >= 0.24, <= 0.25.2\""))))
+            (add-after 'install 'install-doc
+              (lambda _
+                (with-directory-excursion "docs/man"
+                  (let ((man (string-append #$output "/share/man")))
+                    (install-file "panctl.1" (string-append man "/man1"))
+                    (install-file "pantalaimon.5" (string-append man "/man5"))
+                    (install-file "pantalaimon.8" (string-append man "/man8"))))))
+            (replace 'check
+              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                (when tests?
+                  (add-installed-pythonpath inputs outputs)
+                  (invoke "pytest" "-vv" "tests"
+                          ;; These tests hang.
+                          "--ignore=tests/proxy_test.py"
+                          "-k" "not test_start_loop")))))))
+      (native-inputs
+       (list python-aioresponses
+             python-faker
+             python-pytest
+             python-pytest-aiohttp
+             python-pytest-asyncio))
+      (propagated-inputs
+       (list python-aiohttp
+             python-attrs
+             python-cachetools
+             python-click
+             python-dbus
+             python-janus
+             python-keyring
+             python-logbook
+             python-matrix-nio
+             python-notify2
+             python-peewee
+             python-platformdirs
+             python-prompt-toolkit
+             python-pydbus
+             python-pygobject))
+      (home-page "https://github.com/matrix-org/pantalaimon")
+      (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
+      (description
+       "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
 daemon.  Pantalaimon acts as a good man in the middle that handles the
 encryption for you.  Messages are transparently encrypted and decrypted for
 clients inside of pantalaimon.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))

base-commit: 7da088166d03859ccc69d65748c708caa0cbd2e8
-- 
2.47.1

Message #47 received at 75420 <at> debbugs.gnu.org (full text, mbox):

From: Ian Eure <ian <at> retrospec.tv>
To: Arjan Adriaanse <arjan <at> adriaan.se>, 75420 <at> debbugs.gnu.org
Cc: control <at> debbugs.gnu.org
Subject: Re: [bug#75420] [PATCH python-team v3] gnu: pantalaimon: Update to
 0.10.5-0.257ef6a.
Date: Fri, 31 Jan 2025 06:29:35 -0800

usertag 75420 + reviewed-looks-good
thanks

Hi Arjan,

This looks good to me.  I was investigating why this was broken
yesterday, because it’s been a topic on IRC.  I’d gotten most of the way
to where this patch is before I noticed it.

Is there any reason not to push this to master?

  -- Ian

Arjan Adriaanse <arjan <at> adriaan.se> writes:

> * gnu/packages/matrix.scm (pantalaimon): Update to 0.10.5-0.257ef6a.
> [arguments]<#:phases>: Change requirements, skip hanging tests.
> [native-inputs]: Add python-pytest-asyncio.
> [propagated-inputs]: Replace python-appdirs with python-platformdirs.
>
> Change-Id: Ie2ccb3263f41193e504184157d3a4be301ddacbf
> ---
>
> I forgot to include the copyright notice from the initial version.
>
> gnu/packages/matrix.scm | 131 +++++++++++++++++++++-------------------
>  1 file changed, 68 insertions(+), 63 deletions(-)
>
> diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
> index 8d1aca4b2e..be3edae0dc 100644
> --- a/gnu/packages/matrix.scm
> +++ b/gnu/packages/matrix.scm
> @@ -6,6 +6,7 @@
>  ;;; Copyright © 2022 Aleksandr Vityazev <avityazev <at> posteo.org>
>  ;;; Copyright © 2022 Morgan Smith <Morgan.J.Smith <at> outlook.com>
>  ;;; Copyright © 2025 Ricardo Wurmus <rekado <at> elephly.net>
> +;;; Copyright © 2025 Arjan Adriaanse <arjan <at> adriaan.se>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -226,69 +227,73 @@ (define-public python-matrix-nio
>      (license license:isc)))
>  
>  (define-public pantalaimon
> -  (package
> -    (name "pantalaimon")
> -    (version "0.10.5")
> -    (source
> -     (origin
> -       (method git-fetch)
> -       (uri (git-reference
> -             (url "https://github.com/matrix-org/pantalaimon")
> -             (commit version)))
> -       (file-name (git-file-name name version))
> -       (sha256
> -        (base32
> -         "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68"))))
> -    (build-system python-build-system)
> -    (arguments
> -     (list
> -      #:phases
> -      #~(modify-phases %standard-phases
> -          (add-after 'unpack 'downgrade-appdirs-requirement
> -            (lambda _
> -              (substitute* "setup.py"
> -                ;; FIXME: Remove this once appdirs is updated.
> -                ;; Upgrading python-appdirs requires rebuilting 3000+ packages,
> -                ;; when 1.4.4 is a simple maintenance fix from 1.4.3.
> -                (("appdirs >= 1.4.4") "appdirs >= 1.4.3"))))
> -          (add-after 'install 'install-doc
> -            (lambda _
> -              (with-directory-excursion "docs/man"
> -                (let ((man (string-append #$output "/share/man")))
> -                  (install-file "panctl.1" (string-append man "/man1"))
> -                  (install-file "pantalaimon.5" (string-append man "/man5"))
> -                  (install-file "pantalaimon.8" (string-append man "/man8"))))))
> -          (replace 'check
> -            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
> -              (when tests?
> -                (add-installed-pythonpath inputs outputs)
> -                (invoke "pytest" "-vv" "tests")))))))
> -    (native-inputs
> -     (list python-aioresponses
> -           python-faker
> -           python-pytest
> -           python-pytest-aiohttp))
> -    (propagated-inputs
> -     (list python-aiohttp
> -           python-appdirs
> -           python-attrs
> -           python-cachetools
> -           python-click
> -           python-dbus
> -           python-janus
> -           python-keyring
> -           python-logbook
> -           python-matrix-nio
> -           python-notify2
> -           python-peewee
> -           python-prompt-toolkit
> -           python-pydbus
> -           python-pygobject))
> -    (home-page "https://github.com/matrix-org/pantalaimon")
> -    (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
> -    (description
> -     "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
> +  (let ((commit "257ef6a2e5e5668cd43347037c09ba036f91d997")
> +        (revision "0"))
> +    (package
> +      (name "pantalaimon")
> +      (version (git-version "0.10.5" revision commit))
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/matrix-org/pantalaimon")
> +               (commit commit)))
> +         (file-name (git-file-name name version))
> +         (sha256
> +          (base32 "1i18mjlc143d2xwlha09i5ny06vipmy8fii05427zq5vjz8rysgx"))))
> +      (build-system python-build-system)
> +      (arguments
> +       (list
> +        #:phases
> +        #~(modify-phases %standard-phases
> +            (add-after 'unpack 'relax-requirements
> +              (lambda _
> +                (substitute* "setup.py"
> +                  ;; Newer version is packaged.
> +                  (("\"matrix-nio\\[e2e\\] >= 0\\.24, < 0\\.25\\.2\"")
> +                   "\"matrix-nio[e2e] >= 0.24, <= 0.25.2\""))))
> +            (add-after 'install 'install-doc
> +              (lambda _
> +                (with-directory-excursion "docs/man"
> +                  (let ((man (string-append #$output "/share/man")))
> +                    (install-file "panctl.1" (string-append man "/man1"))
> +                    (install-file "pantalaimon.5" (string-append man "/man5"))
> +                    (install-file "pantalaimon.8" (string-append man "/man8"))))))
> +            (replace 'check
> +              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
> +                (when tests?
> +                  (add-installed-pythonpath inputs outputs)
> +                  (invoke "pytest" "-vv" "tests"
> +                          ;; These tests hang.
> +                          "--ignore=tests/proxy_test.py"
> +                          "-k" "not test_start_loop")))))))
> +      (native-inputs
> +       (list python-aioresponses
> +             python-faker
> +             python-pytest
> +             python-pytest-aiohttp
> +             python-pytest-asyncio))
> +      (propagated-inputs
> +       (list python-aiohttp
> +             python-attrs
> +             python-cachetools
> +             python-click
> +             python-dbus
> +             python-janus
> +             python-keyring
> +             python-logbook
> +             python-matrix-nio
> +             python-notify2
> +             python-peewee
> +             python-platformdirs
> +             python-prompt-toolkit
> +             python-pydbus
> +             python-pygobject))
> +      (home-page "https://github.com/matrix-org/pantalaimon")
> +      (synopsis "Matrix proxy daemon that adds E2E encryption capabilities")
> +      (description
> +       "Pantalaimon is an end-to-end encryption aware Matrix reverse proxy
>  daemon.  Pantalaimon acts as a good man in the middle that handles the
>  encryption for you.  Messages are transparently encrypted and decrypted for
>  clients inside of pantalaimon.")
> -    (license license:asl2.0)))
> +      (license license:asl2.0))))
>
> base-commit: 7da088166d03859ccc69d65748c708caa0cbd2e8

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.