Re: [PR PATCH] [Updated] streamlink 2.3.0 and python3-websocket-client 1.2.1

[paper42 <paper42@users.noreply.github.com>]

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

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages streamlink-2.3.0
https://github.com/void-linux/void-packages/pull/32593

streamlink 2.3.0 and python3-websocket-client 1.2.1
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

python3-websocket-client:
* they changed their license to Apache2
* 0.58.0 was a breaking release, but some distributions didn't notice (alpine had 0.58 for a while), so the update should be without a problem, now they follow semver
* 1.0.0 dropped python2 support

docker-compose:
* I removed websocket-client from dependencies, because they don't use it since 2014, but they still list it in dependencies https://github.com/docker/compose/issues/8455

python3-requests (updated because streamlink needs requests>=2.26):
* python3-chardet was replaced by python3-charset-normalizer in the python3 package (upstream decision)


A patch file from https://github.com/void-linux/void-packages/pull/32593.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-streamlink-2.3.0-32593.patch --]
[-- Type: text/x-diff, Size: 10113 bytes --]

From bd5a0298c1b603062192d68f23f50fd479f4ce2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 20 Aug 2021 00:33:38 +0200
Subject: [PATCH 1/6] New package: python3-charset-normalizer-2.0.4

---
 srcpkgs/python3-charset-normalizer/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-charset-normalizer/template

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
new file mode 100644
index 000000000000..c7d212d8cf1d
--- /dev/null
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-charset-normalizer'
+pkgname=python3-charset-normalizer
+version=2.0.4
+revision=1
+wrksrc="charset_normalizer-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Encoding and language detection"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://charset-normalizer.readthedocs.io/"
+distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
+checksum=3fcde2e1c62bb86ed8e20ce03127ffa5ac09a3e2f2c69cc273834ed6d3e94205
+
+post_install() {
+	vlicense LICENSE
+}

From 5d3946995428f8cae9b521f48a007155afed00b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 22 Aug 2021 22:01:17 +0200
Subject: [PATCH 2/6] python-idna: split python3-idna to a separate package

idna v3 doesn't support python2 anymore, so let's move with the python3
variant and leave the python2 variant on v2
---
 srcpkgs/python-idna/template  | 13 ++-----------
 srcpkgs/python3-idna          |  1 -
 srcpkgs/python3-idna/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-idna
 create mode 100644 srcpkgs/python3-idna/template

diff --git a/srcpkgs/python-idna/template b/srcpkgs/python-idna/template
index 5ecad795c9db..05101f64b883 100644
--- a/srcpkgs/python-idna/template
+++ b/srcpkgs/python-idna/template
@@ -3,8 +3,8 @@ pkgname=python-idna
 version=2.10
 revision=1
 wrksrc="idna-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -17,12 +17,3 @@ checksum=b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6
 post_install() {
 	vlicense LICENSE.rst
 }
-
-python3-idna_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-idna b/srcpkgs/python3-idna
deleted file mode 120000
index a7670f279131..000000000000
--- a/srcpkgs/python3-idna
+++ /dev/null
@@ -1 +0,0 @@
-python-idna
\ No newline at end of file
diff --git a/srcpkgs/python3-idna/template b/srcpkgs/python3-idna/template
new file mode 100644
index 000000000000..29f49107e2f3
--- /dev/null
+++ b/srcpkgs/python3-idna/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-idna'
+pkgname=python3-idna
+version=3.2
+revision=1
+wrksrc="idna-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Internationalized Domain Names in Applications (IDNA) for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/kjd/idna"
+changelog="https://raw.githubusercontent.com/kjd/idna/master/HISTORY.rst"
+distfiles="${PYPI_SITE}/i/idna/idna-${version}.tar.gz"
+checksum=467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3
+
+post_install() {
+	vlicense LICENSE.md
+}

From 453f2bf5fbdaaea4d4ab040917d721f2af45636f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Jul 2021 22:37:52 +0200
Subject: [PATCH 3/6] python-requests: update to 2.26.0.

---
 srcpkgs/python-requests/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index bde0b03b9ef9..ab2e1eb27067 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,6 +1,6 @@
 # Template file for 'python-requests'
 pkgname=python-requests
-version=2.25.1
+version=2.26.0
 revision=1
 wrksrc="requests-${version}"
 build_style=python-module
@@ -12,14 +12,15 @@ license="Apache-2.0"
 homepage="https://python-requests.org/"
 changelog="https://raw.githubusercontent.com/psf/requests/master/HISTORY.md"
 distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz"
-checksum=27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804
+checksum=b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7
+make_check=no # tests are broken for python2 requests
 
 post_patch() {
 	vsed -i '/certifi/d' setup.py
 }
 
 python3-requests_package() {
-	depends="ca-certificates python3-chardet python3-urllib3 python3-idna"
+	depends="ca-certificates python3-charset-normalizer python3-urllib3 python3-idna"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From 70520634096b62f22a64de60eced0dbe0954451c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Jul 2021 12:36:05 +0200
Subject: [PATCH 4/6] docker-compose: remove python3-websocket-client
 dependency

they don't use websocket-client since 2014, but they still list it in
dependencies: https://github.com/docker/compose/issues/8455
---
 srcpkgs/docker-compose/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index c5fcdb65a0ac..12506d44b64e 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,14 +1,14 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=1.27.4
-revision=2
+revision=3
 wrksrc="compose-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
- python3-dockerpty python3-websocket-client python3-requests python3-docopt
- python3-yaml python3-six python3-texttable python3-cached-property
- python3-paramiko>=2.4.2 python3-dotenv python3-distro"
+ python3-dockerpty python3-requests python3-docopt python3-yaml python3-six
+ python3-texttable python3-cached-property python3-paramiko>=2.4.2
+ python3-dotenv python3-distro"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"

From 4d2a1adf9975dc2c541ba42ada2287008e2d32ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 14 Jun 2021 18:16:04 +0200
Subject: [PATCH 5/6] python3-websocket-client: update to 1.2.1.

---
 srcpkgs/python3-websocket-client/template | 27 +++++++----------------
 srcpkgs/python3-websocket-client/update   |  1 -
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/python3-websocket-client/update

diff --git a/srcpkgs/python3-websocket-client/template b/srcpkgs/python3-websocket-client/template
index 248adfbf7616..ecc47dca1e55 100644
--- a/srcpkgs/python3-websocket-client/template
+++ b/srcpkgs/python3-websocket-client/template
@@ -1,29 +1,18 @@
 # Template file for 'python3-websocket-client'
 pkgname=python3-websocket-client
-version=0.57.0
+version=1.2.1
 revision=1
-wrksrc="websocket_client-${version}"
+wrksrc="websocket-client-${version}"
 build_style=python3-module
+make_check_target="websocket/tests"
 hostmakedepends="python3-setuptools"
-depends="python3-six ca-certificates"
-checkdepends="python3-pytest python3-six"
+depends="ca-certificates"
+checkdepends="python3-pytest"
 short_desc="WebSocket client for Python3"
 maintainer="Sergi Alvarez <pancake@nopcode.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://github.com/websocket-client/websocket-client"
 changelog="https://raw.githubusercontent.com/websocket-client/websocket-client/master/ChangeLog"
-distfiles="${PYPI_SITE}/w/websocket-client/websocket_client-${version}.tar.gz"
-checksum=d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010
+distfiles="https://github.com/websocket-client/websocket-client/archive/refs/tags/v$version.tar.gz"
+checksum=8e056ff93c85b1961234d1c36fda8c5277a03f1ba475d93afb8ec46d2a7976de
 alternatives="websocket-client:wsdump:/usr/bin/wsdump.py"
-
-do_check() {
-	python3 -m pytest
-}
-
-pre_build() {
-	vsed -i "s|'backports.ssl_match_hostname'||" setup.py
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-websocket-client/update b/srcpkgs/python3-websocket-client/update
deleted file mode 100644
index 98c17ed0e0b7..000000000000
--- a/srcpkgs/python3-websocket-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=websocket_client

From d8b606de3b1c6a3d579c84b0c3afeecaeb66f477 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 14 Jun 2021 18:15:56 +0200
Subject: [PATCH 6/6] streamlink: update to 2.3.0.

---
 srcpkgs/streamlink/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 5b2a5626c20b..ce8ff3f11d86 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=2.0.0
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,7 +15,8 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=c0ead9e961638d41cab9bd9677cdc701f2313bfd4d23cd8158410932839c62db
+checksum=1497e6dc5d2fb8c5b17688f20ca2e8989a279de804a4de37d2107af33b9faa04
+make_check=ci-skip # some tests fail when running as root
 
 export STREAMLINK_USE_PYCOUNTRY=1