[bug#54515] [PATCH] gnu: streamlink: Update to 3.2.0.

[bug#54515] [PATCH] gnu: streamlink: Update to 3.2.0.

[Chadwain Holness]

* gnu/packages/video.scm (streamlink): Update to 3.2.0.
[inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and python-iso639.
[arguments]<#:phases>{check}: Use pytest and skip some failing tests.
* gnu.packages/xml.scm (python-lxml): Update to 4.7.1.
---
 gnu/packages/video.scm | 23 +++++++++++++++++------
 gnu/packages/xml.scm   |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..a9ba40e302 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Bird <birdsite@airmail.cc>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Chadwain Holness <chadwainholness@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3135,28 +3136,38 @@ (define-public xvid
 (define-public streamlink
   (package
     (name "streamlink")
-    (version "2.0.0")
+    (version "3.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "streamlink" version))
         (sha256
          (base32
-          "1nv2kj1k42a1b20ws8sdzlxk3wh1qz6pg5mxp75433b3c7lxksn0"))))
+          "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p"))))
     (build-system python-build-system)
-    (home-page "https://github.com/streamlink/streamlink")
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+         (add-after 'unpack 'skip-failing-tests
+          (lambda _ (substitute* "tests/utils/test_l10n.py"
+              (("^import streamlink" all)
+               (string-append "import pytest\n" all))
+              (("(\\s*)def (test_equivalent|test_equivalent_remap|test_get_language|test_language_a3_no_a2|test_language_en)\\b" all indent)
+               (string-append indent "@pytest.mark.skip(\"Skipped by Guix.\")\n" all)))))
+         (replace 'check
+          (lambda _ (invoke "python" "-m" "pytest"))))))
     (native-inputs
-     (list python-freezegun python-pytest python-mock
+     (list python-freezegun python-mock python-pytest
            python-requests-mock))
     (propagated-inputs
      (list python-pysocks
            python-websocket-client
-           python-iso3166
-           python-iso639
            python-isodate
+           python-lxml
+           python-pycountry
            python-pycryptodome
            python-requests
            python-urllib3))
+    (home-page "https://github.com/streamlink/streamlink")
     (synopsis "Extract streams from various services")
     (description "Streamlink is command-line utility that extracts streams
 from sites like Twitch.tv and pipes them into a video player of choice.")
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 49275c3e0c..50f552e048 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2500,13 +2500,13 @@ (define-public python-elementpath
 (define-public python-lxml
   (package
     (name "python-lxml")
-    (version "4.6.3")
+    (version "4.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "lxml" version))
        (sha256
-        (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr"))
+        (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))
        ;; Adapt a test to libxml2 2.9.12, taken from this commit:
        ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e
        (modules '((guix build utils)))
-- 
2.35.1

[bug#54515] [PATCH] gnu: streamlink: Update to 3.2.0.

[Maxime Devos]

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

Chadwain Holness schreef op ma 21-03-2022 om 20:49 [-0400]:
> +          (lambda _ (substitute* "tests/utils/test_l10n.py"
> +              (("^import streamlink" all)
> +               (string-append "import pytest\n" all))
> +              (("(\\s*)def (test_equivalent|test_equivalent_remap|test_get_language|test_language_a3_no_a2|test_language_en)\\b" all indent)
> +               (string-append indent "@pytest.mark.skip(\"Skipped by Guix.\")\n" all)))))

What's wrong with the tests?

> +         (replace 'check
> +          (lambda _ (invoke "python" "-m" "pytest"))))))

Try running the linter "./pre-inst-env guix lint streamlink",
it will give a warning.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54515] [PATCH v2] gnu: streamlink: Update to 3.2.0.

[Chadwain Holness]

* gnu/packages/video.scm (streamlink): Update to 3.2.0.
[inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and python-iso639.
[arguments]<#:phases>{check}: Use pytest.
* gnu.packages/xml.scm (python-lxml): Update to 4.7.1.
(python-pycountry): Update to 22.3.5.

> What's wrong with the tests?

They were tests for some locale stuff, but it turns out updating python-pycountry fixes them.

---
 gnu/packages/python-xyz.scm |  4 ++--
 gnu/packages/video.scm      | 17 +++++++++++------
 gnu/packages/xml.scm        |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7649dd0ad5..dd18fbc65c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18414,14 +18414,14 @@ (define-public python-ddt
 (define-public python-pycountry
   (package
     (name "python-pycountry")
-    (version "18.5.26")
+    (version "22.3.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pycountry" version))
        (sha256
         (base32
-         "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz"))))
+         "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/flyingcircus/pycountry")
     (synopsis "ISO databases for languages, countries, currencies, etc.")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..dbb7b44e53 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Bird <birdsite@airmail.cc>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Chadwain Holness <chadwainholness@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3135,28 +3136,32 @@ (define-public xvid
 (define-public streamlink
   (package
     (name "streamlink")
-    (version "2.0.0")
+    (version "3.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "streamlink" version))
         (sha256
          (base32
-          "1nv2kj1k42a1b20ws8sdzlxk3wh1qz6pg5mxp75433b3c7lxksn0"))))
+          "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p"))))
     (build-system python-build-system)
-    (home-page "https://github.com/streamlink/streamlink")
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+         (replace 'check
+          (lambda _ (invoke "python" "-m" "pytest"))))))
     (native-inputs
-     (list python-freezegun python-pytest python-mock
+     (list python-freezegun python-mock python-pytest
            python-requests-mock))
     (propagated-inputs
      (list python-pysocks
            python-websocket-client
-           python-iso3166
-           python-iso639
            python-isodate
+           python-lxml
+           python-pycountry
            python-pycryptodome
            python-requests
            python-urllib3))
+    (home-page "https://github.com/streamlink/streamlink")
     (synopsis "Extract streams from various services")
     (description "Streamlink is command-line utility that extracts streams
 from sites like Twitch.tv and pipes them into a video player of choice.")
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 49275c3e0c..50f552e048 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2500,13 +2500,13 @@ (define-public python-elementpath
 (define-public python-lxml
   (package
     (name "python-lxml")
-    (version "4.6.3")
+    (version "4.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "lxml" version))
        (sha256
-        (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr"))
+        (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))
        ;; Adapt a test to libxml2 2.9.12, taken from this commit:
        ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e
        (modules '((guix build utils)))
-- 
2.35.1

[bug#54515] [PATCH v2] gnu: streamlink: Update to 3.2.0.

[Maxime Devos]

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

Chadwain Holness schreef op di 22-03-2022 om 11:04 [-0400]:
> +    (arguments
> +     `(#:phases (modify-phases %standard-phases
> +         (replace 'check
> +          (lambda _ (invoke "python" "-m" "pytest"))))))

As mentioned previously:

  Try running the linter "./pre-inst-env guix lint streamlink",
  it will give a warning.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54515] [PATCH v3] gnu: streamlink: Update to 3.2.0.

[Chadwain Holness]

* gnu/packages/video.scm (streamlink): Update to 3.2.0.
[inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and python-iso639.
[arguments]<#:phases>{check}: Use pytest.
* gnu.packages/xml.scm (python-lxml): Update to 4.7.1.
(python-pycountry): Update to 22.3.5.


Sorry thought I included this change before

---
 gnu/packages/python-xyz.scm |  4 ++--
 gnu/packages/video.scm      | 19 +++++++++++++------
 gnu/packages/xml.scm        |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7649dd0ad5..dd18fbc65c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18414,14 +18414,14 @@ (define-public python-ddt
 (define-public python-pycountry
   (package
     (name "python-pycountry")
-    (version "18.5.26")
+    (version "22.3.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pycountry" version))
        (sha256
         (base32
-         "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz"))))
+         "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/flyingcircus/pycountry")
     (synopsis "ISO databases for languages, countries, currencies, etc.")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..dab1d9c907 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Bird <birdsite@airmail.cc>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Chadwain Holness <chadwainholness@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3135,28 +3136,34 @@ (define-public xvid
 (define-public streamlink
   (package
     (name "streamlink")
-    (version "2.0.0")
+    (version "3.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "streamlink" version))
         (sha256
          (base32
-          "1nv2kj1k42a1b20ws8sdzlxk3wh1qz6pg5mxp75433b3c7lxksn0"))))
+          "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p"))))
     (build-system python-build-system)
-    (home-page "https://github.com/streamlink/streamlink")
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+         (replace 'check
+          (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                  (invoke "python" "-m" "pytest")))))))
     (native-inputs
-     (list python-freezegun python-pytest python-mock
+     (list python-freezegun python-mock python-pytest
            python-requests-mock))
     (propagated-inputs
      (list python-pysocks
            python-websocket-client
-           python-iso3166
-           python-iso639
            python-isodate
+           python-lxml
+           python-pycountry
            python-pycryptodome
            python-requests
            python-urllib3))
+    (home-page "https://github.com/streamlink/streamlink")
     (synopsis "Extract streams from various services")
     (description "Streamlink is command-line utility that extracts streams
 from sites like Twitch.tv and pipes them into a video player of choice.")
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 49275c3e0c..50f552e048 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2500,13 +2500,13 @@ (define-public python-elementpath
 (define-public python-lxml
   (package
     (name "python-lxml")
-    (version "4.6.3")
+    (version "4.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "lxml" version))
        (sha256
-        (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr"))
+        (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))
        ;; Adapt a test to libxml2 2.9.12, taken from this commit:
        ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e
        (modules '((guix build utils)))
-- 
2.35.1

[bug#54515] [PATCH] gnu: streamlink: Update to 3.2.0.

[Ludovic Courtès]

Hi,

Chadwain Holness <chadwainholness@gmail.com> skribis:

> * gnu/packages/video.scm (streamlink): Update to 3.2.0.
> [inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and python-iso639.
> [arguments]<#:phases>{check}: Use pytest.
> * gnu.packages/xml.scm (python-lxml): Update to 4.7.1.
> (python-pycountry): Update to 22.3.5.

(This last one is actually in python-xyz.scm.)

One last request: We normally include one change per patch:

  https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html

Thus, unless all three packages need to be updated in lockstep, could
you submit them as one patch per package update?

After that I promise we’re done.  :-)

Thanks in advance!

Ludo’.

[bug#54515] [PATCH v4 0/3] gnu: streamlink: Update to 3.2.0.

[Chadwain Holness]

Thanks for your patience and helping me get this right! I believe it should be correct this time.

Chadwain Holness (3):
  gnu: python-pycountry: Update to 22.3.5.
  gnu: python-lxml: Update to 4.7.1.
  gnu: streamlink: Update to 3.2.0.

 gnu/packages/python-xyz.scm |  4 ++--
 gnu/packages/video.scm      | 19 +++++++++++++------
 gnu/packages/xml.scm        |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

-- 
2.35.1

[bug#54515] [PATCH v4 1/3] gnu: python-pycountry: Update to 22.3.5.

[Chadwain Holness]

* gnu/packages/python-xyz.scm (python-pycountry): Update to 22.3.5.
---
 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 7649dd0ad5..dd18fbc65c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18414,14 +18414,14 @@ (define-public python-ddt
 (define-public python-pycountry
   (package
     (name "python-pycountry")
-    (version "18.5.26")
+    (version "22.3.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pycountry" version))
        (sha256
         (base32
-         "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz"))))
+         "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/flyingcircus/pycountry")
     (synopsis "ISO databases for languages, countries, currencies, etc.")
-- 
2.35.1

[bug#54515] [PATCH v4 1/3] gnu: python-pycountry: Update to 22.3.5.

[Ludovic Courtès]

Hi,

Chadwain Holness <chadwainholness@gmail.com> skribis:

> * gnu/packages/python-xyz.scm (python-pycountry): Update to 22.3.5.

Applied, thanks!

[bug#54515] [PATCH v4 2/3] gnu: python-lxml: Update to 4.7.1.

[Chadwain Holness]

* gnu/packages/xml.scm (python-lxml): Update to 4.7.1.
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 49275c3e0c..50f552e048 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2500,13 +2500,13 @@ (define-public python-elementpath
 (define-public python-lxml
   (package
     (name "python-lxml")
-    (version "4.6.3")
+    (version "4.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "lxml" version))
        (sha256
-        (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr"))
+        (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))
        ;; Adapt a test to libxml2 2.9.12, taken from this commit:
        ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e
        (modules '((guix build utils)))
-- 
2.35.1

[bug#54515] [PATCH v4 2/3] gnu: python-lxml: Update to 4.7.1.

[Ludovic Courtès]

Chadwain Holness <chadwainholness@gmail.com> skribis:

> * gnu/packages/xml.scm (python-lxml): Update to 4.7.1.

Unfortunately this one has too many dependencies, as reported by
‘guix refresh -l python-lxml’.

So I can apply it on the ‘core-updates’ branch, but it won’t be merged
before a few months.  Or you can define it as a variant, and we’d keep
both versions in ‘master’.

WDYT?

Ludo’.

[bug#54515] [PATCH v4 2/3] gnu: python-lxml: Update to 4.7.1.

[Chadwain Holness]

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

This doesn't need to be applied right away, so I think simply applying it
to core-updates would be fine.


On Fri, Apr 1, 2022, 12:03 PM Ludovic Courtès <ludo@gnu.org> wrote:

> Chadwain Holness <chadwainholness@gmail.com> skribis:
>
> > * gnu/packages/xml.scm (python-lxml): Update to 4.7.1.
>
> Unfortunately this one has too many dependencies, as reported by
> ‘guix refresh -l python-lxml’.
>
> So I can apply it on the ‘core-updates’ branch, but it won’t be merged
> before a few months.  Or you can define it as a variant, and we’d keep
> both versions in ‘master’.
>
> WDYT?
>
> Ludo’.
>

[-- Attachment #2: Type: text/html, Size: 1098 bytes --]

bug#54515: [PATCH] gnu: streamlink: Update to 3.2.0.

[Ludovic Courtès]

Hi!

I ended up with a middleground solution in commit
ff3355dcbf155fcdb3ff1502efe13d969c5d6979.

Let me know if anything’s amiss.

Thanks,
Ludo’.

[bug#54515] [PATCH] gnu: streamlink: Update to 3.2.0.

[Chadwain Holness]

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

Looks good to me, thanks!

[-- Attachment #2: Type: text/html, Size: 48 bytes --]

[bug#54515] [PATCH v4 3/3] gnu: streamlink: Update to 3.2.0.

[Chadwain Holness]

* gnu/packages/video.scm (streamlink): Update to 3.2.0.
[inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and python-iso639.
[arguments]<#:phases>{check}: Use pytest.
---
 gnu/packages/video.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..dab1d9c907 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Bird <birdsite@airmail.cc>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Chadwain Holness <chadwainholness@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3135,28 +3136,34 @@ (define-public xvid
 (define-public streamlink
   (package
     (name "streamlink")
-    (version "2.0.0")
+    (version "3.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "streamlink" version))
         (sha256
          (base32
-          "1nv2kj1k42a1b20ws8sdzlxk3wh1qz6pg5mxp75433b3c7lxksn0"))))
+          "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p"))))
     (build-system python-build-system)
-    (home-page "https://github.com/streamlink/streamlink")
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+         (replace 'check
+          (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                  (invoke "python" "-m" "pytest")))))))
     (native-inputs
-     (list python-freezegun python-pytest python-mock
+     (list python-freezegun python-mock python-pytest
            python-requests-mock))
     (propagated-inputs
      (list python-pysocks
            python-websocket-client
-           python-iso3166
-           python-iso639
            python-isodate
+           python-lxml
+           python-pycountry
            python-pycryptodome
            python-requests
            python-urllib3))
+    (home-page "https://github.com/streamlink/streamlink")
     (synopsis "Extract streams from various services")
     (description "Streamlink is command-line utility that extracts streams
 from sites like Twitch.tv and pipes them into a video player of choice.")
-- 
2.35.1