[bug#62389] [PATCH 00/12] gnu: synapse: Update to 1.67.0

[bug#62389] [PATCH 00/12] gnu: synapse: Update to 1.67.0

[conses]

Hi,

This patch series updates Synapse to the latest version where no Rust
tooling is needed, as per
<https://github.com/matrix-org/synapse/releases/tag/v1.67.0>.  I tried
packaging version 1.68.0 onward but it requires a ton of transitive Rust
library dependencies, as in the case of python-cryptography-next, and
there are a lot of version mismatches with existing ones.  I propose to
update to a later version once a better way of dealing with Rust
dependencies is found.  Moreover, build times on those versions are
significantly increased, taking well over an hour in my machine.  All in
all, this makes it really difficult to troubleshoot any packaging errors
so I hope for an easier time in future versions.

Tests were also removed since they depend on libraries that are
considered optional (causing build times to be increased too), and
they currently fail because some of the ones that test Twisted
functionality require network access.

Apart from that, this basically updates a few of its dependencies, and
moves some of them to use python-cryptography-next.

I think more emphasis should be put on updating this package more
frequently (e.g. <https://issues.guix.gnu.org/56373>), since Matrix is a
widely used communication platform, and the fact that there hasn't been
an update for more than 2 years while Nix is on the latest version
doesn't look good for Guix and its adoption.

conses (12):
  gnu: Add python-matrix-common.
  gnu: python-twisted: Update to 22.10.0.
  gnu: python-pyopenssl: Move to python-cryptography-next.
  gnu: python-urllib3: Move to python-cryptography-next.
  gnu: python-treq: Update to 20.9.0.
  gnu: python-josepy: Move to python-cryptography-next.
  gnu: python-secretstorage: Move to python-cryptography-next.
  gnu: python-acme: Move to python-cryptography-next.
  gnu: python-pysaml2: Move to python-cryptography-next.
  gnu: python-incremental: Update to 21.3.0.
  gnu: Add python-txredisapi.
  gnu: synapse: Update to 1.67.0.

 gnu/packages/matrix.scm        | 22 ++++++--
 gnu/packages/python-crypto.scm |  6 +--
 gnu/packages/python-web.scm    |  6 +--
 gnu/packages/python-xyz.scm    | 97 ++++++++++++++++++++++++++++------
 gnu/packages/tls.scm           |  2 +-
 5 files changed, 106 insertions(+), 27 deletions(-)

-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 01/12] gnu: Add python-matrix-common.

[conses]

* gnu/packages/python-xyz.scm (python-matrix-common): New variable.
---
 gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index abe4862121..e394341805 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7220,6 +7220,47 @@ (define-public python-matplotlib-venn
 three-way Venn diagrams in @code{matplotlib}.")
     (license license:expat)))
 
+(define-public python-matrix-common
+  (package
+    (name"python-matrix-common")
+    (version "1.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "matrix_common" version))
+              (sha256
+               (base32
+                "0lrqzb6s57fxp0kwffdqnkr2pj9aia459cv1b95b55dxlq1cz7d9"))))
+    (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda _
+              (setenv "SOURCE_DATE_EPOCH"
+                      (number->string (* 10 366 24 60 60)))
+              (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
+          (replace 'install
+            (lambda _
+              (let ((whl (car (find-files "dist" "\\.whl$"))))
+                (invoke "pip" "--no-cache-dir" "--no-input"
+                        "install" "--no-deps" "--prefix" #$output whl))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest" "-vv" "tests")))))))
+    (native-inputs
+     (list
+      python-pypa-build
+      python-pytest
+      python-setuptools-scm
+      python-wheel))
+    (home-page "https://github.com/matrix-org/matrix-python-common")
+    (synopsis "Common code for Synapse, Sydent and Sygnal")
+    (description "This package provides common utilities for Synapse, Sydent
+and Sygnal.")
+    (license license:asl2.0)))
+
 (define-public python-pysnptools
   (package
     (name "python-pysnptools")
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 02/12] gnu: python-twisted: Update to 22.10.0.

[conses]

* gnu/packages/python-xyz.scm (python-twisted): Update to 22.10.0.
[arguments]: Disable tests and add phases.
[inputs]: Add python's tk output as a dependency.
[native-inputs]: Add Python dependencies.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e394341805..bba9c0126f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17337,30 +17337,37 @@ (define-public python-fastimport
 (define-public python-twisted
   (package
     (name "python-twisted")
-    (version "19.7.0")
+    (version "22.10.0")
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "Twisted" version ".tar.bz2"))
+              (uri (pypi-uri "Twisted" version ".tar.gz"))
               (sha256
                (base32
-                "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym"))))
+                "0cad5n7h8nd0nyl865sn8l4ja0mkwbx9n41cnkklcpsgm50bvb1j"))))
     (build-system python-build-system)
     (arguments
-     '(#:tests? #f                    ; FIXME: some tests fail
-       #:phases
-       (modify-phases %standard-phases
-         ;; Remove scripts, because they depend on [conch]
-         (add-after 'unpack 'remove-entrypoint
-           (lambda _
-             (substitute* "src/twisted/python/_setup.py"
-               (("\".+ = twisted\\.conch\\.scripts\\..+\",") "")))))))
+     (list
+      #:tests? #f                       ; FIXME: some tests fail
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-for-older-attrs
+            (lambda _
+              (substitute* (find-files "." "\\.py$")
+                (("from attrs\\b")
+                 "from attr")))))))
+    (inputs (list (list python "tk")))
+    (native-inputs (list python-wheel))
     (propagated-inputs
      (list python-zope-interface
            python-pyhamcrest
            python-incremental
            python-hyperlink
            python-constantly
-           python-automat))
+           python-automat
+           python-typing-extensions
+           python-bcrypt
+           python-cryptography-next
+           python-pyasn1))
     (home-page "https://twistedmatrix.com/")
     (synopsis "Asynchronous networking framework written in Python")
     (description
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 03/12] gnu: python-pyopenssl: Move to python-cryptography-next.

[conses]

* gnu/packages/python-crypto.scm (python-openssl):
[propagated-inputs]: Move to python-cryptography-next.
---
 gnu/packages/python-crypto.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index c9071c4cf6..6ce1a0a11c 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -740,7 +740,7 @@ (define-public python-pyopenssl
                          ;; https://github.com/pyca/pyopenssl/issues/974
                          "and not test_verify_with_time"))))))))
     (propagated-inputs
-     (list python-cryptography python-six))
+     (list python-cryptography-next python-six))
     (inputs
      (list openssl))
     (native-inputs
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 04/12] gnu: python-urllib3: Move to python-cryptography-next.

[conses]

* gnu/packages/python-web.scm (python-urllib3):
[propagated-inputs]: Move to python-cryptography-next.
---
 gnu/packages/python-web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8a73c929a1..e893f1bd5f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3310,7 +3310,7 @@ (define-public python-urllib3
     (propagated-inputs
      (list ;; These 5 inputs are used to build urrlib3[secure]
            python-certifi
-           python-cryptography
+           python-cryptography-next
            python-idna
            python-pyopenssl
            python-pysocks))
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 05/12] gnu: python-treq: Update to 20.9.0.

[conses]

* gnu/packages/python-web.scm (python-treq): Update to 20.9.0.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e893f1bd5f..8155a6d898 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4976,14 +4976,14 @@ (define-public python-hyperlink
 (define-public python-treq
   (package
     (name "python-treq")
-    (version "18.6.0")
+    (version "20.9.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "treq" version))
         (sha256
          (base32
-          "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+          "18kdk11d84lyxj6dz183nblc6c6r4rj1hk0lpsyiykzgbakjrkc3"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 06/12] gnu: python-josepy: Move to python-cryptography-next.

[conses]

* gnu/packages/python-crypto.scm (python-josepy):
[propagated-inputs]: Move to python-cryptography-next.
---
 gnu/packages/python-crypto.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6ce1a0a11c..8f8eb23954 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -976,7 +976,7 @@ (define-public python-josepy
      ;; TODO: some test dependencies are missing (see pyproject.toml).
      '(#:tests? #f))
     (propagated-inputs
-     (list python-cryptography python-pyopenssl))
+     (list python-cryptography-next python-pyopenssl))
     (home-page "https://github.com/certbot/josepy")
     (synopsis "JOSE protocol implementation in Python")
     (description "This package provides a Python implementation of the JOSE
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 07/12] gnu: python-secretstorage: Move to python-cryptography-next.

[conses]

* gnu/packages/python-crypto.scm (python-secretstorage):
[propagated-inputs]: Move to python-cryptography-next.
---
 gnu/packages/python-crypto.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 8f8eb23954..2e82343b7b 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -1488,7 +1488,7 @@ (define-public python-secretstorage
     (arguments
      '(#:tests? #f)) ; Tests require a running dbus service.
     (propagated-inputs
-     (list python-cryptography python-jeepney))
+     (list python-cryptography-next python-jeepney))
     (home-page "https://github.com/mitya57/secretstorage")
     (synopsis "Python bindings to FreeDesktop.org Secret Service API")
     (description
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 08/12] gnu: python-acme: Move to python-cryptography-next.

[conses]

* gnu/packages/tls.scm (python-acme):
[propagated-inputs]: Move to python-cryptography-next.
---
 gnu/packages/tls.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 5a44fa89dc..5c9a8faca6 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -810,7 +810,7 @@ (define-public python-acme
            python-pytz
            python-pyrfc3339
            python-pyasn1
-           python-cryptography
+           python-cryptography-next
            python-pyopenssl))
     (home-page "https://github.com/certbot/certbot")
     (synopsis "ACME protocol implementation in Python")
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 09/12] gnu: python-pysaml2: Move to python-cryptography-next.

[conses]

* gnu/packages/python-xyz.scm (python-pysaml2):
[propagated-inputs]: Move to python-cryptography-next.
---
 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 bba9c0126f..f4f31c421a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27062,7 +27062,7 @@ (define-public python-pysaml2
          "1xk2x0slz1f8cqv7vn77qx99xfd1mshhswiwrljk9m72w2m9iivd"))))
     (build-system python-build-system)
     (propagated-inputs
-     (list python-cryptography
+     (list python-cryptography-next
            python-dateutil
            python-defusedxml
            python-importlib-resources
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 10/12] gnu: python-incremental: Update to 21.3.0.

[conses]

* gnu/packages/python-xyz.scm (python-incremental): Update to 21.3.0.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f4f31c421a..7f15c6340f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19923,14 +19923,14 @@ (define-public python-pypeg2
 (define-public python-incremental
   (package
     (name "python-incremental")
-    (version "17.5.0")
+    (version "21.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "incremental" version))
        (sha256
         (base32
-         "1cylxdz1cnkm5g3pklna3h2n0i0rks95ir1pnpxfnvpkmab1cxbv"))))
+         "0mvgbmsnv1c8ziydw41jjkivc0zcqyzli7frcpvbkxj8zxddxx82"))))
     (build-system python-build-system)
     (home-page "https://github.com/hawkowl/incremental")
     (synopsis "Library for versioning Python projects")
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 11/12] gnu: Add python-txredisapi.

[conses]

* gnu/packages/python-xyz.scm (python-txredisapi): New variable.
---
 gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7f15c6340f..bb5e5fcf50 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -24845,6 +24845,25 @@ (define-public python-txaio
 @code{asyncio} module and @code{Twisted}.")
     (license license:expat)))
 
+(define-public python-txredisapi
+  (package
+    (name "python-txredisapi")
+    (version "1.4.9")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "txredisapi" version))
+              (sha256
+               (base32
+                "0na5x3b53ni98h1cyakac36mqzgyldvfn6a7z270nkays1i70q69"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-pyopenssl python-six python-twisted))
+    (home-page "http://github.com/IlyaSkriblovsky/txredisapi")
+    (synopsis "Non-blocking redis client for Python")
+    (description "Non-blocking client driver for the redis database, written
+in Python.  It uses Twisted for the asynchronous communication with
+redis.")
+    (license license:asl2.0)))
+
 (define-public python-toolshed
   (package
     (name "python-toolshed")
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH 12/12] gnu: synapse: Update to 1.67.0.

[conses]

* gnu/packages/matrix.scm (synapse): Update to 1.67.0.
[propagated-inputs]: Add Python dependencies.
[arguments]: Disable tests.
---
 gnu/packages/matrix.scm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 2ed7a9a782..519f5009d2 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages matrix)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system python)
   #:use-module (guix download)
@@ -93,14 +94,18 @@ (define-public python-matrix-synapse-ldap3
 (define-public synapse
   (package
     (name "synapse")
-    (version "1.29.0")
+    (version "1.67.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "matrix-synapse" version))
               (sha256
                (base32
-                "0if2yhpz8psg0661401mvxznldbfhk2j9rhbs25jdaqm9jsv6907"))))
+                "05mljp6jjz7ylmmjvlvxm3w9h3ynrjq5b3b3zssmr48lbjxrb8pk"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      ;; Tests require network access
+      #:tests? #f))
     ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
     (propagated-inputs
      (list python-simplejson ; not attested but required
@@ -133,11 +138,18 @@ (define-public synapse
            python-jinja2
            python-bleach
            python-typing-extensions
-           ;; conditional requirements (synapse/python_dependencies.py)
-           ;;("python-hiredis" ,python-hiredis)
+           python-matrix-common
+           python-pyperf
+           python-redis
+           python-ijson
+           python-cryptography-next
+           python-pydantic
+           ;; conditional requirements (pyproject.toml)
            python-matrix-synapse-ldap3
            python-psycopg2
            python-jinja2
+           python-txredisapi
+           python-hiredis
            python-txacme
            python-pysaml2
            python-lxml
@@ -146,7 +158,7 @@ (define-public synapse
            ;; all are monitoring aids and not essential.
            python-pyjwt))
     (native-inputs
-     (list python-mock python-parameterized))
+     (list python-mock python-parameterized openssl))
     (home-page "https://github.com/matrix-org/synapse")
     (synopsis "Matrix reference homeserver")
     (description "Synapse is a reference \"homeserver\" implementation of
-- 
2.39.1



-- 
Best regards,
conses

[bug#62389] [PATCH v2 1/6] gnu: Add python-matrix-common.

[Miguel Ángel Moreno]

* gnu/packages/python-xyz.scm (python-matrix-common): New variable.
---
 gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 47cea7be6f..29166b5887 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7793,6 +7793,47 @@ (define-public python-matplotlib-venn
 three-way Venn diagrams in @code{matplotlib}.")
     (license license:expat)))
 
+(define-public python-matrix-common
+  (package
+    (name"python-matrix-common")
+    (version "1.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "matrix_common" version))
+              (sha256
+               (base32
+                "0lrqzb6s57fxp0kwffdqnkr2pj9aia459cv1b95b55dxlq1cz7d9"))))
+    (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda _
+              (setenv "SOURCE_DATE_EPOCH"
+                      (number->string (* 10 366 24 60 60)))
+              (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
+          (replace 'install
+            (lambda _
+              (let ((whl (car (find-files "dist" "\\.whl$"))))
+                (invoke "pip" "--no-cache-dir" "--no-input"
+                        "install" "--no-deps" "--prefix" #$output whl))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest" "-vv" "tests")))))))
+    (native-inputs
+     (list
+      python-pypa-build
+      python-pytest
+      python-setuptools-scm
+      python-wheel))
+    (home-page "https://github.com/matrix-org/matrix-python-common")
+    (synopsis "Common code for Synapse, Sydent and Sygnal")
+    (description "This package provides common utilities for Synapse, Sydent
+and Sygnal.")
+    (license license:asl2.0)))
+
 (define-public python-pysnptools
   (package
     (name "python-pysnptools")
-- 
2.40.1


-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v2 2/6] gnu: python-twisted: Update to 22.10.0.

[Miguel Ángel Moreno]

* gnu/packages/python-xyz.scm (python-twisted): Update to 22.10.0.
[arguments]: Disable tests and add phases.
[inputs]: Add python's tk output as a dependency.
[native-inputs]: Add Python dependencies.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 29166b5887..e08a30e136 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18062,30 +18062,37 @@ (define-public python-fastimport
 (define-public python-twisted
   (package
     (name "python-twisted")
-    (version "19.7.0")
+    (version "22.10.0")
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "Twisted" version ".tar.bz2"))
+              (uri (pypi-uri "Twisted" version ".tar.gz"))
               (sha256
                (base32
-                "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym"))))
+                "0cad5n7h8nd0nyl865sn8l4ja0mkwbx9n41cnkklcpsgm50bvb1j"))))
     (build-system python-build-system)
     (arguments
-     '(#:tests? #f                    ; FIXME: some tests fail
-       #:phases
-       (modify-phases %standard-phases
-         ;; Remove scripts, because they depend on [conch]
-         (add-after 'unpack 'remove-entrypoint
-           (lambda _
-             (substitute* "src/twisted/python/_setup.py"
-               (("\".+ = twisted\\.conch\\.scripts\\..+\",") "")))))))
+     (list
+      #:tests? #f                       ; FIXME: some tests fail
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-for-older-attrs
+            (lambda _
+              (substitute* (find-files "." "\\.py$")
+                (("from attrs\\b")
+                 "from attr")))))))
+    (inputs (list (list python "tk")))
+    (native-inputs (list python-wheel))
     (propagated-inputs
      (list python-zope-interface
            python-pyhamcrest
            python-incremental
            python-hyperlink
            python-constantly
-           python-automat))
+           python-automat
+           python-typing-extensions
+           python-bcrypt
+           python-cryptography
+           python-pyasn1))
     (home-page "https://twistedmatrix.com/")
     (synopsis "Asynchronous networking framework written in Python")
     (description
-- 
2.40.1


-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v2 2/6] gnu: python-twisted: Update to 22.10.0.

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 2920 bytes --]

On 2023-06-07 19:29, Miguel Ángel Moreno wrote:

> * gnu/packages/python-xyz.scm (python-twisted): Update to 22.10.0.
> [arguments]: Disable tests and add phases.
> [inputs]: Add python's tk output as a dependency.
> [native-inputs]: Add Python dependencies.
> ---
>  gnu/packages/python-xyz.scm | 31 +++++++++++++++++++------------
>  1 file changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 29166b5887..e08a30e136 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -18062,30 +18062,37 @@ (define-public python-fastimport
>  (define-public python-twisted
>    (package
>      (name "python-twisted")
> -    (version "19.7.0")
> +    (version "22.10.0")
>      (source (origin
>                (method url-fetch)
> -              (uri (pypi-uri "Twisted" version ".tar.bz2"))
> +              (uri (pypi-uri "Twisted" version ".tar.gz"))
>                (sha256
>                 (base32
> -                "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym"))))
> +                "0cad5n7h8nd0nyl865sn8l4ja0mkwbx9n41cnkklcpsgm50bvb1j"))))
>      (build-system python-build-system)
>      (arguments
> -     '(#:tests? #f                    ; FIXME: some tests fail
> -       #:phases
> -       (modify-phases %standard-phases
> -         ;; Remove scripts, because they depend on [conch]
> -         (add-after 'unpack 'remove-entrypoint
> -           (lambda _
> -             (substitute* "src/twisted/python/_setup.py"
> -               (("\".+ = twisted\\.conch\\.scripts\\..+\",") "")))))))
> +     (list
> +      #:tests? #f                       ; FIXME: some tests fail
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-after 'unpack 'adjust-for-older-attrs
> +            (lambda _
> +              (substitute* (find-files "." "\\.py$")
> +                (("from attrs\\b")
> +                 "from attr")))))))
> +    (inputs (list (list python "tk")))
> +    (native-inputs (list python-wheel))
>      (propagated-inputs
>       (list python-zope-interface
>             python-pyhamcrest
>             python-incremental
>             python-hyperlink
>             python-constantly
> -           python-automat))
> +           python-automat
> +           python-typing-extensions
> +           python-bcrypt
> +           python-cryptography
> +           python-pyasn1))
>      (home-page "https://twistedmatrix.com/")
>      (synopsis "Asynchronous networking framework written in Python")
>      (description
> -- 
> 2.40.1

The patch series LGTM, but python-twisted requires to rebuild more than
300 packages, so it probably should be pushed to a separate branch first
to ensure everything builds on a CI.  CCed python team, Ricardo and
Tobias.

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#62389] [PATCH v2 3/6] gnu: python-treq: Update to 20.9.0.

[Miguel Ángel Moreno]

* gnu/packages/python-web.scm (python-treq): Update to 20.9.0.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dbd6e98730..837fb5b6a0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5134,14 +5134,14 @@ (define-public python-hyperlink
 (define-public python-treq
   (package
     (name "python-treq")
-    (version "18.6.0")
+    (version "20.9.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "treq" version))
         (sha256
          (base32
-          "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+          "18kdk11d84lyxj6dz183nblc6c6r4rj1hk0lpsyiykzgbakjrkc3"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-- 
2.40.1

-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v2 4/6] gnu: python-incremental: Update to 21.3.0.

[Miguel Ángel Moreno]

* gnu/packages/python-xyz.scm (python-incremental): Update to 21.3.0.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e08a30e136..3061e202b0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20712,14 +20712,14 @@ (define-public python-pypeg2
 (define-public python-incremental
   (package
     (name "python-incremental")
-    (version "17.5.0")
+    (version "21.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "incremental" version))
        (sha256
         (base32
-         "1cylxdz1cnkm5g3pklna3h2n0i0rks95ir1pnpxfnvpkmab1cxbv"))))
+         "0mvgbmsnv1c8ziydw41jjkivc0zcqyzli7frcpvbkxj8zxddxx82"))))
     (build-system python-build-system)
     (home-page "https://github.com/hawkowl/incremental")
     (synopsis "Library for versioning Python projects")
-- 
2.40.1

-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v2 5/6] gnu: Add python-txredisapi.

[Miguel Ángel Moreno]

* gnu/packages/python-xyz.scm (python-txredisapi): New variable.
---
 gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3061e202b0..32ef8b25e9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25668,6 +25668,25 @@ (define-public python-txaio
 @code{asyncio} module and @code{Twisted}.")
     (license license:expat)))
 
+(define-public python-txredisapi
+  (package
+    (name "python-txredisapi")
+    (version "1.4.9")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "txredisapi" version))
+              (sha256
+               (base32
+                "0na5x3b53ni98h1cyakac36mqzgyldvfn6a7z270nkays1i70q69"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-pyopenssl python-six python-twisted))
+    (home-page "http://github.com/IlyaSkriblovsky/txredisapi")
+    (synopsis "Non-blocking redis client for Python")
+    (description "Non-blocking client driver for the redis database, written
+in Python.  It uses Twisted for the asynchronous communication with
+redis.")
+    (license license:asl2.0)))
+
 (define-public python-toolshed
   (package
     (name "python-toolshed")
-- 
2.40.1


-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v2 6/6] gnu: synapse: Update to 1.67.0.

[Miguel Ángel Moreno]

* gnu/packages/matrix.scm (synapse): Update to 1.67.0.
[propagated-inputs]: Add Python dependencies.
[arguments]: Disable tests.
---
 gnu/packages/matrix.scm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index f356674ed9..f67591f934 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages matrix)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system python)
   #:use-module (guix download)
@@ -93,14 +94,18 @@ (define-public python-matrix-synapse-ldap3
 (define-public synapse
   (package
     (name "synapse")
-    (version "1.29.0")
+    (version "1.67.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "matrix-synapse" version))
               (sha256
                (base32
-                "0if2yhpz8psg0661401mvxznldbfhk2j9rhbs25jdaqm9jsv6907"))))
+                "05mljp6jjz7ylmmjvlvxm3w9h3ynrjq5b3b3zssmr48lbjxrb8pk"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      ;; Tests require network access
+      #:tests? #f))
     ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
     (propagated-inputs
      (list python-simplejson ; not attested but required
@@ -133,11 +138,18 @@ (define-public synapse
            python-jinja2
            python-bleach
            python-typing-extensions
-           ;; conditional requirements (synapse/python_dependencies.py)
-           ;;("python-hiredis" ,python-hiredis)
+           python-matrix-common
+           python-pyperf
+           python-redis
+           python-cryptography
+           python-ijson
+           python-pydantic
+           ;; conditional requirements (pyproject.toml)
            python-matrix-synapse-ldap3
            python-psycopg2
            python-jinja2
+           python-txredisapi
+           python-hiredis
            python-txacme
            python-pysaml2
            python-lxml
@@ -146,7 +158,7 @@ (define-public synapse
            ;; all are monitoring aids and not essential.
            python-pyjwt))
     (native-inputs
-     (list python-mock python-parameterized))
+     (list python-mock python-parameterized openssl))
     (home-page "https://github.com/matrix-org/synapse")
     (synopsis "Matrix reference homeserver")
     (description "Synapse is a reference \"homeserver\" implementation of
-- 
2.40.1

-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v3 1/5] gnu: Add python-matrix-common.

[Miguel Ángel Moreno]

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

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c68b17b0ab..8aaf2d63d3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8902,6 +8902,47 @@ (define-public python-perfplot
 the results.")
     (license license:gpl3+)))
 
+(define-public python-matrix-common
+  (package
+    (name"python-matrix-common")
+    (version "1.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "matrix_common" version))
+              (sha256
+               (base32
+                "0lrqzb6s57fxp0kwffdqnkr2pj9aia459cv1b95b55dxlq1cz7d9"))))
+    (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda _
+              (setenv "SOURCE_DATE_EPOCH"
+                      (number->string (* 10 366 24 60 60)))
+              (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
+          (replace 'install
+            (lambda _
+              (let ((whl (car (find-files "dist" "\\.whl$"))))
+                (invoke "pip" "--no-cache-dir" "--no-input"
+                        "install" "--no-deps" "--prefix" #$output whl))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest" "-vv" "tests")))))))
+    (native-inputs
+     (list
+      python-pypa-build
+      python-pytest
+      python-setuptools-scm
+      python-wheel))
+    (home-page "https://github.com/matrix-org/matrix-python-common")
+    (synopsis "Common code for Synapse, Sydent and Sygnal")
+    (description "This package provides common utilities for Synapse, Sydent
+and Sygnal.")
+    (license license:asl2.0)))
+
 (define-public python-pysnptools
   (package
     (name "python-pysnptools")

base-commit: 6f78803b01d416ab421ba860751b764b9e4f33db
-- 
2.41.0



-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v3 1/5] gnu: Add python-matrix-common.

[Miguel Ángel Moreno]

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

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c68b17b0ab..8aaf2d63d3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8902,6 +8902,47 @@ (define-public python-perfplot
 the results.")
     (license license:gpl3+)))
 
+(define-public python-matrix-common
+  (package
+    (name"python-matrix-common")
+    (version "1.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "matrix_common" version))
+              (sha256
+               (base32
+                "0lrqzb6s57fxp0kwffdqnkr2pj9aia459cv1b95b55dxlq1cz7d9"))))
+    (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda _
+              (setenv "SOURCE_DATE_EPOCH"
+                      (number->string (* 10 366 24 60 60)))
+              (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
+          (replace 'install
+            (lambda _
+              (let ((whl (car (find-files "dist" "\\.whl$"))))
+                (invoke "pip" "--no-cache-dir" "--no-input"
+                        "install" "--no-deps" "--prefix" #$output whl))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest" "-vv" "tests")))))))
+    (native-inputs
+     (list
+      python-pypa-build
+      python-pytest
+      python-setuptools-scm
+      python-wheel))
+    (home-page "https://github.com/matrix-org/matrix-python-common")
+    (synopsis "Common code for Synapse, Sydent and Sygnal")
+    (description "This package provides common utilities for Synapse, Sydent
+and Sygnal.")
+    (license license:asl2.0)))
+
 (define-public python-pysnptools
   (package
     (name "python-pysnptools")

base-commit: 6f78803b01d416ab421ba860751b764b9e4f33db
-- 
2.41.0



-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v3 2/5] gnu: python-twisted: Update to 22.10.0.

[Miguel Ángel Moreno]

* gnu/packages/python-xyz.scm (python-twisted): Update to 22.10.0.
[arguments]: Disable tests and add phases.
[inputs]: Add python's tk output as a dependency.
[native-inputs]: Add Python dependencies.

Change-Id: I841fbe5923875f2d4bb760619b9ac3710ed06bad
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8aaf2d63d3..8bce7ea8aa 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19874,30 +19874,37 @@ (define-public python-fastimport
 (define-public python-twisted
   (package
     (name "python-twisted")
-    (version "19.7.0")
+    (version "22.10.0")
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "Twisted" version ".tar.bz2"))
+              (uri (pypi-uri "Twisted" version ".tar.gz"))
               (sha256
                (base32
-                "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym"))))
+                "0cad5n7h8nd0nyl865sn8l4ja0mkwbx9n41cnkklcpsgm50bvb1j"))))
     (build-system python-build-system)
     (arguments
-     '(#:tests? #f                    ; FIXME: some tests fail
-       #:phases
-       (modify-phases %standard-phases
-         ;; Remove scripts, because they depend on [conch]
-         (add-after 'unpack 'remove-entrypoint
-           (lambda _
-             (substitute* "src/twisted/python/_setup.py"
-               (("\".+ = twisted\\.conch\\.scripts\\..+\",") "")))))))
+     (list
+      #:tests? #f                       ; FIXME: some tests fail
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-for-older-attrs
+            (lambda _
+              (substitute* (find-files "." "\\.py$")
+                (("from attrs\\b")
+                 "from attr")))))))
+    (inputs (list (list python "tk")))
+    (native-inputs (list python-wheel))
     (propagated-inputs
      (list python-zope-interface
            python-pyhamcrest
            python-incremental
            python-hyperlink
            python-constantly
-           python-automat))
+           python-automat
+           python-typing-extensions
+           python-bcrypt
+           python-cryptography
+           python-pyasn1))
     (home-page "https://twistedmatrix.com/")
     (synopsis "Asynchronous networking framework written in Python")
     (description
-- 
2.41.0



-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v3 3/5] gnu: python-treq: Update to 20.9.0.

[Miguel Ángel Moreno]

* gnu/packages/python-web.scm (python-treq): Update to 20.9.0.

Change-Id: I4c2a64affa0aa14bf46da1bbe0b1186c18f7424d
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c0cc46e5f..fc8a93189f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5474,14 +5474,14 @@ (define-public python-hyperlink
 (define-public python-treq
   (package
     (name "python-treq")
-    (version "18.6.0")
+    (version "20.9.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "treq" version))
         (sha256
          (base32
-          "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+          "18kdk11d84lyxj6dz183nblc6c6r4rj1hk0lpsyiykzgbakjrkc3"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-- 
2.41.0



-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v3 4/5] gnu: Add python-txredisapi.

[Miguel Ángel Moreno]

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

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8bce7ea8aa..8ee8f99b61 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27909,6 +27909,25 @@ (define-public python-txaio
 @code{asyncio} module and @code{Twisted}.")
     (license license:expat)))
 
+(define-public python-txredisapi
+  (package
+    (name "python-txredisapi")
+    (version "1.4.9")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "txredisapi" version))
+              (sha256
+               (base32
+                "0na5x3b53ni98h1cyakac36mqzgyldvfn6a7z270nkays1i70q69"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-pyopenssl python-six python-twisted))
+    (home-page "http://github.com/IlyaSkriblovsky/txredisapi")
+    (synopsis "Non-blocking redis client for Python")
+    (description "Non-blocking client driver for the redis database, written
+in Python.  It uses Twisted for the asynchronous communication with
+redis.")
+    (license license:asl2.0)))
+
 (define-public python-toolshed
   (package
     (name "python-toolshed")
-- 
2.41.0



-- 
Best regards,
Miguel Ángel Moreno

[bug#62389] [PATCH v3 5/5] gnu: synapse: Update to 1.67.0.

[Miguel Ángel Moreno]

* gnu/packages/matrix.scm (synapse): Update to 1.67.0.
[propagated-inputs]: Add Python dependencies.
[arguments]: Disable tests.

Change-Id: I01bc5efe8d81e028fa0cca1037673cc3e9932adb
---
 gnu/packages/matrix.scm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm
index 32ae62fcb4..700ac60979 100644
--- a/gnu/packages/matrix.scm
+++ b/gnu/packages/matrix.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages matrix)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
@@ -94,14 +95,18 @@ (define-public python-matrix-synapse-ldap3
 (define-public synapse
   (package
     (name "synapse")
-    (version "1.29.0")
+    (version "1.67.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "matrix-synapse" version))
               (sha256
                (base32
-                "0if2yhpz8psg0661401mvxznldbfhk2j9rhbs25jdaqm9jsv6907"))))
+                "05mljp6jjz7ylmmjvlvxm3w9h3ynrjq5b3b3zssmr48lbjxrb8pk"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      ;; Tests require network access
+      #:tests? #f))
     ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
     (propagated-inputs
      (list python-simplejson ; not attested but required
@@ -134,11 +139,18 @@ (define-public synapse
            python-jinja2
            python-bleach
            python-typing-extensions
-           ;; conditional requirements (synapse/python_dependencies.py)
-           ;;("python-hiredis" ,python-hiredis)
+           python-matrix-common
+           python-pyperf
+           python-redis
+           python-cryptography
+           python-ijson
+           python-pydantic
+           ;; conditional requirements (pyproject.toml)
            python-matrix-synapse-ldap3
            python-psycopg2
            python-jinja2
+           python-txredisapi
+           python-hiredis
            python-txacme
            python-pysaml2
            python-lxml
@@ -147,7 +159,7 @@ (define-public synapse
            ;; all are monitoring aids and not essential.
            python-pyjwt))
     (native-inputs
-     (list python-mock python-parameterized))
+     (list python-mock python-parameterized openssl))
     (home-page "https://github.com/matrix-org/synapse")
     (synopsis "Matrix reference homeserver")
     (description "Synapse is a reference \"homeserver\" implementation of
-- 
2.41.0



-- 
Best regards,
Miguel Ángel Moreno