diff mbox series

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

Message ID 5eb3a1e70596428bfda2097192b1b48b357dac88.1686158920.git.me@mianmoreno.com
State New
Headers
Series [bug#62389,v2,1/6] gnu: Add python-matrix-common. |

Commit Message

Miguel Ángel Moreno June 7, 2023, 5:29 p.m. UTC 
* 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(-)

Comments

Andrew Tropin Aug. 31, 2023, 5:23 a.m. UTC | #1 
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.
diff mbox series

Patch

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