* [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
@ 2024-04-28 14:39 tstraus13
2024-04-28 14:48 ` [PR PATCH] [Updated] " tstraus13
` (38 more replies)
0 siblings, 39 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1398 bytes --]
There is a new pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 3022 bytes --]
From 0213b73bb2d41775c3d9281c7a2adcce0b470f28 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to
do once this has been accepted/merged.
---
srcpkgs/python3-trio-websocket/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..465f9036afbed2
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="This library implements both server and client aspects of the the WebSocket protocol, striving for safety, correctness, and ergonomics."
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From f215dbe2eec59d18d7db2103fe4e33e93a8e672b Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:35:23 -0400
Subject: [PATCH 2/2] Fix short_desc and add maintainer
---
srcpkgs/python3-trio-websocket/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
index 465f9036afbed2..d01b1e803f49f5 100644
--- a/srcpkgs/python3-trio-websocket/template
+++ b/srcpkgs/python3-trio-websocket/template
@@ -7,8 +7,8 @@ hostmakedepends="python3-setuptools python3-wheel"
depends="python3-trio python3-wsproto"
checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
python3-async_generator python3-jedi python3-openssl python3-trustme"
-short_desc="This library implements both server and client aspects of the the WebSocket protocol, striving for safety, correctness, and ergonomics."
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
license="Apache-2.0, MIT"
homepage="https://github.com/python-trio/trio-websocket"
changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
@ 2024-04-28 14:48 ` tstraus13
2024-04-28 15:01 ` tstraus13
` (37 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 3852 bytes --]
From 0213b73bb2d41775c3d9281c7a2adcce0b470f28 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/3] Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to
do once this has been accepted/merged.
---
srcpkgs/python3-trio-websocket/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..465f9036afbed2
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="This library implements both server and client aspects of the the WebSocket protocol, striving for safety, correctness, and ergonomics."
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From f215dbe2eec59d18d7db2103fe4e33e93a8e672b Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:35:23 -0400
Subject: [PATCH 2/3] Fix short_desc and add maintainer
---
srcpkgs/python3-trio-websocket/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
index 465f9036afbed2..d01b1e803f49f5 100644
--- a/srcpkgs/python3-trio-websocket/template
+++ b/srcpkgs/python3-trio-websocket/template
@@ -7,8 +7,8 @@ hostmakedepends="python3-setuptools python3-wheel"
depends="python3-trio python3-wsproto"
checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
python3-async_generator python3-jedi python3-openssl python3-trustme"
-short_desc="This library implements both server and client aspects of the the WebSocket protocol, striving for safety, correctness, and ergonomics."
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
license="Apache-2.0, MIT"
homepage="https://github.com/python-trio/trio-websocket"
changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
From e72acced42ca14f19fee650ff5b6f242f11a4819 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:48:28 -0400
Subject: [PATCH 3/3] Ignore Test
---
srcpkgs/python3-trio-websocket/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
index d01b1e803f49f5..cd62e5f2420384 100644
--- a/srcpkgs/python3-trio-websocket/template
+++ b/srcpkgs/python3-trio-websocket/template
@@ -3,6 +3,7 @@ pkgname=python3-trio-websocket
version=0.11.1
revision=1
build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-trio python3-wsproto"
checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
2024-04-28 14:48 ` [PR PATCH] [Updated] " tstraus13
@ 2024-04-28 15:01 ` tstraus13
2024-04-28 16:18 ` classabbyamp
` (36 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081513588
Comment:
It was having issues with the tests and so I added a line similar to the python3-trio package to ignore the test. Though it is still failing on Github CI/CD for some reason. It is building alright on my machine. Let me know what I am missing. Thanks.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
2024-04-28 14:48 ` [PR PATCH] [Updated] " tstraus13
2024-04-28 15:01 ` tstraus13
@ 2024-04-28 16:18 ` classabbyamp
2024-04-28 16:18 ` classabbyamp
` (35 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-04-28 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081539037
Comment:
> which I plan to do once this has been accepted/merged
just do it in this PR
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (2 preceding siblings ...)
2024-04-28 16:18 ` classabbyamp
@ 2024-04-28 16:18 ` classabbyamp
2024-04-28 16:25 ` tstraus13
` (34 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-04-28 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081539037
Comment:
> which I plan to do once this has been accepted/merged
just do it in this PR (one commit per package)
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (3 preceding siblings ...)
2024-04-28 16:18 ` classabbyamp
@ 2024-04-28 16:25 ` tstraus13
2024-04-28 16:34 ` [PR PATCH] [Updated] " tstraus13
` (33 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 16:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081540582
Comment:
Ok. I was not sure if I needed to do 1 PR per package. I will try to get the streamlink package in this PR as well. Thanks.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (4 preceding siblings ...)
2024-04-28 16:25 ` tstraus13
@ 2024-04-28 16:34 ` tstraus13
2024-04-28 17:29 ` tstraus13
` (32 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 1698 bytes --]
From 74df3455309cb3558e519a21c3ced59aae28b211 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH] Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to
do once this has been accepted/merged.
---
srcpkgs/python3-trio-websocket/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..cd62e5f2420384
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (5 preceding siblings ...)
2024-04-28 16:34 ` [PR PATCH] [Updated] " tstraus13
@ 2024-04-28 17:29 ` tstraus13
2024-04-28 17:31 ` classabbyamp
` (31 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081564022
Comment:
So it turns out there is one more dependency for streamlink. It is python-exceptiongroup. I am not able to compile as it only has a pyproject.toml file and no setup.py file. I am not very familiar with Python compilation. On my side its just complaining about the build step and trying to run the do_build step by executing 'python3 setup.py build ${make_build_args}' but setup.py does not exist.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (6 preceding siblings ...)
2024-04-28 17:29 ` tstraus13
@ 2024-04-28 17:31 ` classabbyamp
2024-04-28 17:54 ` tstraus13
` (30 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-04-28 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081565067
Comment:
use the `python3-pep517` build style
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (7 preceding siblings ...)
2024-04-28 17:31 ` classabbyamp
@ 2024-04-28 17:54 ` tstraus13
2024-04-28 17:54 ` tstraus13
` (29 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 17:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081575268
Comment:
> use the `python3-pep517` build style
I am not getting a build error about flit_scm - "ModuleNotFoundError: No module named 'flit_scm'" and after that message "ERROR Backend 'flit_scm:buildapi' is not available.". Does that mean that flit_scm is now a required additional package?
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (8 preceding siblings ...)
2024-04-28 17:54 ` tstraus13
@ 2024-04-28 17:54 ` tstraus13
2024-04-28 18:14 ` [PR PATCH] [Closed]: " classabbyamp
` (28 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 17:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081575268
Comment:
> use the `python3-pep517` build style
I am now getting a build error about flit_scm - "ModuleNotFoundError: No module named 'flit_scm'" and after that message "ERROR Backend 'flit_scm:buildapi' is not available.". Does that mean that flit_scm is now a required additional package?
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Closed]: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (9 preceding siblings ...)
2024-04-28 17:54 ` tstraus13
@ 2024-04-28 18:14 ` classabbyamp
2024-04-28 18:14 ` classabbyamp
` (27 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-04-28 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There's a closed pull request on the void-packages repository
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
https://github.com/void-linux/void-packages/pull/50098
Description:
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (10 preceding siblings ...)
2024-04-28 18:14 ` [PR PATCH] [Closed]: " classabbyamp
@ 2024-04-28 18:14 ` classabbyamp
2024-04-28 18:15 ` classabbyamp
` (26 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-04-28 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3509 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081584576
Comment:
exceptiongroup shouldn't be needed, it's a compatibility backport for <3.11. upstream didn't do any kind of check for python >=3.11 so we should just patch it out:
<details><summary>add this to `srcpkgs/streamlink/patches/`</summary>
<p>
```patch
exceptiongroup is for python<3.11 compat
--- a/src/streamlink.egg-info/requires.txt
+++ b/src/streamlink.egg-info/requires.txt
@@ -1,5 +1,4 @@
certifi
-exceptiongroup
isodate
lxml<6,>=4.6.4
pycountry
--- a/src/streamlink.egg-info/PKG-INFO
+++ b/src/streamlink.egg-info/PKG-INFO
@@ -32,7 +32,6 @@
Description-Content-Type: text/markdown
License-File: LICENSE
Requires-Dist: certifi
-Requires-Dist: exceptiongroup
Requires-Dist: isodate
Requires-Dist: lxml<6,>=4.6.4
Requires-Dist: pycountry
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -32,7 +32,6 @@
Description-Content-Type: text/markdown
License-File: LICENSE
Requires-Dist: certifi
-Requires-Dist: exceptiongroup
Requires-Dist: isodate
Requires-Dist: lxml<6,>=4.6.4
Requires-Dist: pycountry
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,6 @@
requires-python = ">=3.8"
dependencies = [
"certifi",
- "exceptiongroup",
"isodate",
"lxml >=4.6.4,<6",
"pycountry",
--- a/src/streamlink/plugins/twitch.py
+++ b/src/streamlink/plugins/twitch.py
@@ -541,7 +541,6 @@
headers: Mapping[str, str],
device_id: str,
) -> Optional[Tuple[str, int]]:
- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
url = f"https://www.twitch.tv/{channel}"
--- a/src/streamlink/webbrowser/webbrowser.py
+++ b/src/streamlink/webbrowser/webbrowser.py
@@ -8,7 +8,6 @@
from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
import trio
-from exceptiongroup import BaseExceptionGroup
from streamlink.utils.path import resolve_executable
from streamlink.webbrowser.exceptions import WebbrowserError
--- a/src/streamlink/compat.py
+++ b/src/streamlink/compat.py
@@ -5,9 +5,6 @@
import warnings
from typing import Any, Callable, Dict, Optional, Tuple
-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
-import exceptiongroup # noqa: F401
-
from streamlink.exceptions import StreamlinkDeprecationWarning
--- a/tests/webbrowser/test_webbrowser.py
+++ b/tests/webbrowser/test_webbrowser.py
@@ -7,7 +7,6 @@
import pytest
import trio
-from exceptiongroup import BaseExceptionGroup
from streamlink.compat import is_win32
from streamlink.webbrowser.exceptions import WebbrowserError
--- a/tests/webbrowser/cdp/test_connection.py
+++ b/tests/webbrowser/cdp/test_connection.py
@@ -7,7 +7,6 @@
import pytest
import trio
-from exceptiongroup import ExceptionGroup
from trio.testing import MockClock, wait_all_tasks_blocked
from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
--- a/tests/webbrowser/cdp/test_client.py
+++ b/tests/webbrowser/cdp/test_client.py
@@ -4,7 +4,6 @@
import pytest
import trio
-from exceptiongroup import ExceptionGroup
from trio.testing import wait_all_tasks_blocked
from streamlink.session import Streamlink
```
</p>
</details>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (11 preceding siblings ...)
2024-04-28 18:14 ` classabbyamp
@ 2024-04-28 18:15 ` classabbyamp
2024-04-28 18:19 ` tstraus13
` (25 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-04-28 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3520 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081584576
Comment:
exceptiongroup shouldn't be needed, it's a compatibility backport for <3.11. upstream didn't do any kind of check for python >=3.11 so we should just patch it out:
<details><summary>add this to <code>srcpkgs/streamlink/patches/</code></summary>
<p>
```patch
exceptiongroup is for python<3.11 compat
--- a/src/streamlink.egg-info/requires.txt
+++ b/src/streamlink.egg-info/requires.txt
@@ -1,5 +1,4 @@
certifi
-exceptiongroup
isodate
lxml<6,>=4.6.4
pycountry
--- a/src/streamlink.egg-info/PKG-INFO
+++ b/src/streamlink.egg-info/PKG-INFO
@@ -32,7 +32,6 @@
Description-Content-Type: text/markdown
License-File: LICENSE
Requires-Dist: certifi
-Requires-Dist: exceptiongroup
Requires-Dist: isodate
Requires-Dist: lxml<6,>=4.6.4
Requires-Dist: pycountry
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -32,7 +32,6 @@
Description-Content-Type: text/markdown
License-File: LICENSE
Requires-Dist: certifi
-Requires-Dist: exceptiongroup
Requires-Dist: isodate
Requires-Dist: lxml<6,>=4.6.4
Requires-Dist: pycountry
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,6 @@
requires-python = ">=3.8"
dependencies = [
"certifi",
- "exceptiongroup",
"isodate",
"lxml >=4.6.4,<6",
"pycountry",
--- a/src/streamlink/plugins/twitch.py
+++ b/src/streamlink/plugins/twitch.py
@@ -541,7 +541,6 @@
headers: Mapping[str, str],
device_id: str,
) -> Optional[Tuple[str, int]]:
- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
url = f"https://www.twitch.tv/{channel}"
--- a/src/streamlink/webbrowser/webbrowser.py
+++ b/src/streamlink/webbrowser/webbrowser.py
@@ -8,7 +8,6 @@
from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
import trio
-from exceptiongroup import BaseExceptionGroup
from streamlink.utils.path import resolve_executable
from streamlink.webbrowser.exceptions import WebbrowserError
--- a/src/streamlink/compat.py
+++ b/src/streamlink/compat.py
@@ -5,9 +5,6 @@
import warnings
from typing import Any, Callable, Dict, Optional, Tuple
-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
-import exceptiongroup # noqa: F401
-
from streamlink.exceptions import StreamlinkDeprecationWarning
--- a/tests/webbrowser/test_webbrowser.py
+++ b/tests/webbrowser/test_webbrowser.py
@@ -7,7 +7,6 @@
import pytest
import trio
-from exceptiongroup import BaseExceptionGroup
from streamlink.compat import is_win32
from streamlink.webbrowser.exceptions import WebbrowserError
--- a/tests/webbrowser/cdp/test_connection.py
+++ b/tests/webbrowser/cdp/test_connection.py
@@ -7,7 +7,6 @@
import pytest
import trio
-from exceptiongroup import ExceptionGroup
from trio.testing import MockClock, wait_all_tasks_blocked
from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
--- a/tests/webbrowser/cdp/test_client.py
+++ b/tests/webbrowser/cdp/test_client.py
@@ -4,7 +4,6 @@
import pytest
import trio
-from exceptiongroup import ExceptionGroup
from trio.testing import wait_all_tasks_blocked
from streamlink.session import Streamlink
```
</p>
</details>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (12 preceding siblings ...)
2024-04-28 18:15 ` classabbyamp
@ 2024-04-28 18:19 ` tstraus13
2024-04-28 18:35 ` [PR PATCH] [Updated] " tstraus13
` (24 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081585755
Comment:
Ok will do. Thats good news. Ill scrap everything except trio-websocket and streamlink then. Ill do a build and make sure it all works. I may have to step away for some time but I think I'll be able to finish it up at some point today. Thanks for your help.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (13 preceding siblings ...)
2024-04-28 18:19 ` tstraus13
@ 2024-04-28 18:35 ` tstraus13
2024-04-28 18:37 ` tstraus13
` (23 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 6949 bytes --]
From 74df3455309cb3558e519a21c3ced59aae28b211 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to
do once this has been accepted/merged.
---
srcpkgs/python3-trio-websocket/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..cd62e5f2420384
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From 5fbb712effebade5ff297fbf77abbbccfbeba0bc Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] Update: streamlink-6.7.3
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 8 +-
2 files changed, 106 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..302ce91c2f1be6 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
+version=6.7.3
revision=2
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (14 preceding siblings ...)
2024-04-28 18:35 ` [PR PATCH] [Updated] " tstraus13
@ 2024-04-28 18:37 ` tstraus13
2024-04-28 18:44 ` tstraus13
` (22 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081594605
Comment:
Ok well I just went ahead and made the required changes. streamlink should be ready. It compiled fine but I am not testing the package install and then the executable in a VM.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (15 preceding siblings ...)
2024-04-28 18:37 ` tstraus13
@ 2024-04-28 18:44 ` tstraus13
2024-04-28 18:45 ` tstraus13
` (21 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081596720
Comment:
Ok I tested the package installed on a VM and it seems good to go. Thanks again. If there is anything else I am missing let me know.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (16 preceding siblings ...)
2024-04-28 18:44 ` tstraus13
@ 2024-04-28 18:45 ` tstraus13
2024-04-28 18:48 ` [PR PATCH] [Updated] " tstraus13
` (20 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2081594605
Comment:
Ok well I just went ahead and made the required changes. streamlink should be ready. It compiled fine but I am testing the package install and then the executable in a VM.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (17 preceding siblings ...)
2024-04-28 18:45 ` tstraus13
@ 2024-04-28 18:48 ` tstraus13
2024-05-01 1:47 ` tstraus13
` (19 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-04-28 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 6961 bytes --]
From 74df3455309cb3558e519a21c3ced59aae28b211 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to
do once this has been accepted/merged.
---
srcpkgs/python3-trio-websocket/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..cd62e5f2420384
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From ded2cda9fff32d2d84031fa397994554d974a991 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] Update: streamlink-6.7.3
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 10 +-
2 files changed, 107 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..18006c720eb3e1 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (18 preceding siblings ...)
2024-04-28 18:48 ` [PR PATCH] [Updated] " tstraus13
@ 2024-05-01 1:47 ` tstraus13
2024-05-01 2:08 ` tstraus13
` (18 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-01 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 6858 bytes --]
From de6daabda8dec278dabf4b07b8196f1c1fa4c413 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] New package: python3-trio-websocket-0.11.1
---
srcpkgs/python3-trio-websocket/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..cd62e5f2420384
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From b32ab24447c6dda8770e7376afef5159ea6e36f8 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] Update: streamlink-6.7.3
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 10 +-
2 files changed, 107 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..18006c720eb3e1 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (19 preceding siblings ...)
2024-05-01 1:47 ` tstraus13
@ 2024-05-01 2:08 ` tstraus13
2024-05-06 18:34 ` tstraus13
` (17 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-01 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2087870568
Comment:
I am not sure why the check is not passing but I was successfully about to build, install, and run the package locally.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (20 preceding siblings ...)
2024-05-01 2:08 ` tstraus13
@ 2024-05-06 18:34 ` tstraus13
2024-05-06 23:14 ` classabbyamp
` (16 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-06 18:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2096665050
Comment:
@classabbyamp Is there anything else that needs done with this? If you can see a way to fix the Check errors let me know. I am not sure why exactly it fails but I am able to build, install, and run the package locally. Thanks.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (21 preceding siblings ...)
2024-05-06 18:34 ` tstraus13
@ 2024-05-06 23:14 ` classabbyamp
2024-05-06 23:18 ` tstraus13
` (15 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-05-06 23:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097079664
Comment:
it succeeds locally because you probably aren't running the check phase, add -Q to do that
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (22 preceding siblings ...)
2024-05-06 23:14 ` classabbyamp
@ 2024-05-06 23:18 ` tstraus13
2024-05-06 23:20 ` classabbyamp
` (14 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-06 23:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097082857
Comment:
Ok I get the error now but I am still unsure how to fix.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (23 preceding siblings ...)
2024-05-06 23:18 ` tstraus13
@ 2024-05-06 23:20 ` classabbyamp
2024-05-06 23:22 ` tstraus13
` (13 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-05-06 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097084432
Comment:
the tarball from pypi probably doesn't include tests. you might want to try using one from git directly
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (24 preceding siblings ...)
2024-05-06 23:20 ` classabbyamp
@ 2024-05-06 23:22 ` tstraus13
2024-05-06 23:25 ` tstraus13
` (12 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-06 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097086060
Comment:
I do tell it to ignore the tests file as they fail otherwise. I took that from the python3-trio package.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (25 preceding siblings ...)
2024-05-06 23:22 ` tstraus13
@ 2024-05-06 23:25 ` tstraus13
2024-05-06 23:53 ` tstraus13
` (11 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-06 23:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097088633
Comment:
I will attempt to pull from git directly though just in case.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (26 preceding siblings ...)
2024-05-06 23:25 ` tstraus13
@ 2024-05-06 23:53 ` tstraus13
2024-05-06 23:54 ` streamlink: update to 6.7.3 classabbyamp
` (10 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-06 23:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097112736
Comment:
I am getting this error not when attempting to build "neither chroot-git or git are available in your system!" and when I go into chroot via xbps-src chroot and attempt to install git I get this error.
Certificate verification failed for /C=US/O=Let's Encrypt/CN=R3
SSL_connect returned 1
ERROR: [trans] failed to download `gdbm-1.23_1' signature from `https://repo-default.voidlinux.org/current': Operation not permitted
Transaction failed! see above for errors.
I will try again later.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (27 preceding siblings ...)
2024-05-06 23:53 ` tstraus13
@ 2024-05-06 23:54 ` classabbyamp
2024-05-06 23:57 ` tstraus13
` (9 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-05-06 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097113589
Comment:
also, the streamlink commit should be like i titled the PR
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (28 preceding siblings ...)
2024-05-06 23:54 ` streamlink: update to 6.7.3 classabbyamp
@ 2024-05-06 23:57 ` tstraus13
2024-05-07 0:39 ` [PR PATCH] [Updated] " tstraus13
` (8 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-06 23:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097116104
Comment:
> also, the streamlink commit should be like i titled the PR
Ok I will change it then. Thanks.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (29 preceding siblings ...)
2024-05-06 23:57 ` tstraus13
@ 2024-05-07 0:39 ` tstraus13
2024-05-07 0:44 ` tstraus13
` (7 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 0:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
streamlink: update to 6.7.3
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 6858 bytes --]
From de6daabda8dec278dabf4b07b8196f1c1fa4c413 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] New package: python3-trio-websocket-0.11.1
---
srcpkgs/python3-trio-websocket/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..cd62e5f2420384
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From b32ab24447c6dda8770e7376afef5159ea6e36f8 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] Update: streamlink-6.7.3
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 10 +-
2 files changed, 107 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..18006c720eb3e1 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (30 preceding siblings ...)
2024-05-07 0:39 ` [PR PATCH] [Updated] " tstraus13
@ 2024-05-07 0:44 ` tstraus13
2024-05-07 0:55 ` classabbyamp
` (6 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 0:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097155887
Comment:
Even pulling from the git repo for trio-websocket I am getting the same error.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (31 preceding siblings ...)
2024-05-07 0:44 ` tstraus13
@ 2024-05-07 0:55 ` classabbyamp
2024-05-07 1:08 ` [PR PATCH] [Updated] " tstraus13
` (5 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-05-07 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097164498
Comment:
ah well, you disabled the only tests: https://github.com/python-trio/trio-websocket/tree/master/tests
use `make_check=no # reason in a comment` instead
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (32 preceding siblings ...)
2024-05-07 0:55 ` classabbyamp
@ 2024-05-07 1:08 ` tstraus13
2024-05-07 1:17 ` tstraus13
` (4 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
streamlink: update to 6.7.3
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 6858 bytes --]
From de6daabda8dec278dabf4b07b8196f1c1fa4c413 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] New package: python3-trio-websocket-0.11.1
---
srcpkgs/python3-trio-websocket/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..cd62e5f2420384
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+post_install() {
+ vlicense LICENSE
+}
From b32ab24447c6dda8770e7376afef5159ea6e36f8 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] Update: streamlink-6.7.3
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 10 +-
2 files changed, 107 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..18006c720eb3e1 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (33 preceding siblings ...)
2024-05-07 1:08 ` [PR PATCH] [Updated] " tstraus13
@ 2024-05-07 1:17 ` tstraus13
2024-05-07 1:19 ` tstraus13
` (3 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 1:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
streamlink: update to 6.7.3
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 7012 bytes --]
From 37c952bd17fd7444aa11d0afe379f0d395d15897 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] New package: python3-trio-websocket-0.11.1
test
---
srcpkgs/python3-trio-websocket/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..052372edc4dfb1
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest python3-pytest-trio iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+make_check=no # Some kind of check is failing. I ignore any tests anyway. Similar to how python3-trio package works.
+
+post_install() {
+ vlicense LICENSE
+}
From fc59a86cce143838dc35ebf33a1c899354e878d2 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] streamlink: update to 6.7.3
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 10 +-
2 files changed, 107 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..18006c720eb3e1 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (34 preceding siblings ...)
2024-05-07 1:17 ` tstraus13
@ 2024-05-07 1:19 ` tstraus13
2024-05-07 1:26 ` [PR PATCH] [Updated] " tstraus13
` (2 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by tstraus13 on void-packages repository
https://github.com/void-linux/void-packages/pull/50098#issuecomment-2097188234
Comment:
@classabbyamp Ok I think I have things good to go. Let me know if there is anything else needed. Thanks.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (35 preceding siblings ...)
2024-05-07 1:19 ` tstraus13
@ 2024-05-07 1:26 ` tstraus13
2024-05-07 1:29 ` tstraus13
2024-05-07 2:03 ` [PR PATCH] [Closed]: " classabbyamp
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 1:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
streamlink: update to 6.7.3
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 7151 bytes --]
From d72af6fe049ff9115b817ccbec78b3b309b8972e Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] New package: python3-trio-websocket-0.11.1
test
Fix tab
---
srcpkgs/python3-trio-websocket/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..76f8fbcd942163
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest python3-pytest-trio iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+make_check=no # Some kind of check is failing. I ignore any tests anyway. Similar to how python3-trio package works.
+
+post_install() {
+ vlicense LICENSE
+}
From f9a3061606438381006ef78507f7a10f65868ab9 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] streamlink: update to 6.7.3
Fix tabs
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 14 +--
2 files changed, 109 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..f8b6c1e7313383 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
- python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-pysocks python3-requests python3-websocket-client python3-isodate
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
- python3-freezegun python3-pytest-asyncio"
+ python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (36 preceding siblings ...)
2024-05-07 1:26 ` [PR PATCH] [Updated] " tstraus13
@ 2024-05-07 1:29 ` tstraus13
2024-05-07 2:03 ` [PR PATCH] [Closed]: " classabbyamp
38 siblings, 0 replies; 40+ messages in thread
From: tstraus13 @ 2024-05-07 1:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages trio-websocket
https://github.com/void-linux/void-packages/pull/50098
streamlink: update to 6.7.3
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
A patch file from https://github.com/void-linux/void-packages/pull/50098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trio-websocket-50098.patch --]
[-- Type: text/x-diff, Size: 7153 bytes --]
From c401e5f57294c1984f29ad4825b3833b7daa90d8 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 10:12:13 -0400
Subject: [PATCH 1/2] New package: python3-trio-websocket-0.11.1
test
Fix tab
Fix Tab
---
srcpkgs/python3-trio-websocket/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/python3-trio-websocket/template
diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template
new file mode 100644
index 00000000000000..1c1fce90fd5e9d
--- /dev/null
+++ b/srcpkgs/python3-trio-websocket/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-trio-websocket'
+pkgname=python3-trio-websocket
+version=0.11.1
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_connection.py"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-wsproto"
+checkdepends="$depends python3-pytest python3-pytest-trio iana-etc pylint python3-astroid
+ python3-async_generator python3-jedi python3-openssl python3-trustme"
+short_desc="Library implementing server and client WebSocket protocol"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/python-trio/trio-websocket"
+changelog="https://raw.githubusercontent.com/python-trio/trio-websocket/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/t/trio-websocket/trio-websocket-${version}.tar.gz"
+checksum=18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+make_check=no # Some kind of check is failing. I ignore any tests anyway. Similar to how python3-trio package works.
+
+post_install() {
+ vlicense LICENSE
+}
From ae77d703bf9d6c671ec834a331603a28b69601b1 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sun, 28 Apr 2024 14:35:20 -0400
Subject: [PATCH 2/2] streamlink: update to 6.7.3
Fix tabs
---
srcpkgs/streamlink/patches/streamlink.patch | 102 ++++++++++++++++++++
srcpkgs/streamlink/template | 14 +--
2 files changed, 109 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
new file mode 100644
index 00000000000000..5b260226d73126
--- /dev/null
+++ b/srcpkgs/streamlink/patches/streamlink.patch
@@ -0,0 +1,102 @@
+exceptiongroup is for python<3.11 compat
+
+--- a/src/streamlink.egg-info/requires.txt
++++ b/src/streamlink.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ certifi
+-exceptiongroup
+ isodate
+ lxml<6,>=4.6.4
+ pycountry
+--- a/src/streamlink.egg-info/PKG-INFO
++++ b/src/streamlink.egg-info/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -32,7 +32,6 @@
+ Description-Content-Type: text/markdown
+ License-File: LICENSE
+ Requires-Dist: certifi
+-Requires-Dist: exceptiongroup
+ Requires-Dist: isodate
+ Requires-Dist: lxml<6,>=4.6.4
+ Requires-Dist: pycountry
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,7 +56,6 @@
+ requires-python = ">=3.8"
+ dependencies = [
+ "certifi",
+- "exceptiongroup",
+ "isodate",
+ "lxml >=4.6.4,<6",
+ "pycountry",
+--- a/src/streamlink/plugins/twitch.py
++++ b/src/streamlink/plugins/twitch.py
+@@ -541,7 +541,6 @@
+ headers: Mapping[str, str],
+ device_id: str,
+ ) -> Optional[Tuple[str, int]]:
+- from exceptiongroup import BaseExceptionGroup # noqa: PLC0415, I001
+ from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools # noqa: PLC0415
+
+ url = f"https://www.twitch.tv/{channel}"
+--- a/src/streamlink/webbrowser/webbrowser.py
++++ b/src/streamlink/webbrowser/webbrowser.py
+@@ -8,7 +8,6 @@
+ from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
+
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.utils.path import resolve_executable
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/src/streamlink/compat.py
++++ b/src/streamlink/compat.py
+@@ -5,9 +5,6 @@
+ import warnings
+ from typing import Any, Callable, Dict, Optional, Tuple
+
+-# import exceptiongroup, so it can monkeypatch ExceptionGroup logic on <=py311
+-import exceptiongroup # noqa: F401
+-
+ from streamlink.exceptions import StreamlinkDeprecationWarning
+
+
+--- a/tests/webbrowser/test_webbrowser.py
++++ b/tests/webbrowser/test_webbrowser.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import BaseExceptionGroup
+
+ from streamlink.compat import is_win32
+ from streamlink.webbrowser.exceptions import WebbrowserError
+--- a/tests/webbrowser/cdp/test_connection.py
++++ b/tests/webbrowser/cdp/test_connection.py
+@@ -7,7 +7,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import MockClock, wait_all_tasks_blocked
+ from trio_websocket import CloseReason, ConnectionClosed, ConnectionTimeout # type: ignore[import]
+
+--- a/tests/webbrowser/cdp/test_client.py
++++ b/tests/webbrowser/cdp/test_client.py
+@@ -4,7 +4,6 @@
+
+ import pytest
+ import trio
+-from exceptiongroup import ExceptionGroup
+ from trio.testing import wait_all_tasks_blocked
+
+ from streamlink.session import Streamlink
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index af7bfb2514aa87..f8b6c1e7313383 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,21 +1,21 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=5.5.1
-revision=2
+version=6.7.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
depends="python3-lxml python3-pycryptodome python3-pycountry
- python3-pysocks python3-requests python3-websocket-client python3-isodate
- python3-urllib3 python3-certifi"
+ python3-pysocks python3-requests python3-websocket-client python3-isodate
+ python3-urllib3 python3-certifi python3-typing_extensions python3-trio python3-trio-websocket"
checkdepends="$depends python3-pytest python3-mock python3-requests-mock
- python3-freezegun python3-pytest-asyncio"
+ python3-freezegun python3-pytest-asyncio"
short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Tom Strausbaugh <tstrausbaugh@straustech.net>"
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=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
+checksum=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PR PATCH] [Closed]: streamlink: update to 6.7.3
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
` (37 preceding siblings ...)
2024-05-07 1:29 ` tstraus13
@ 2024-05-07 2:03 ` classabbyamp
38 siblings, 0 replies; 40+ messages in thread
From: classabbyamp @ 2024-05-07 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]
There's a closed pull request on the void-packages repository
streamlink: update to 6.7.3
https://github.com/void-linux/void-packages/pull/50098
Description:
It is a requirement for updating the streamlink package which I plan to do once this has been accepted/merged. I have been looking at the streamlink package and it is a little behind and this seems to be the only missing python3 package from the repositories that it needs. Void currently has the python3-trio package, which is used as a starting point for this template. If there is more that is needed for this package, or if I missed anything, in the template let me know. Thanks.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86-64-musl
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2024-05-07 2:03 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-28 14:39 [PR PATCH] New package: python3-trio-websocket-0.11.1 - Add python3-trio-websocket package tstraus13
2024-04-28 14:48 ` [PR PATCH] [Updated] " tstraus13
2024-04-28 15:01 ` tstraus13
2024-04-28 16:18 ` classabbyamp
2024-04-28 16:18 ` classabbyamp
2024-04-28 16:25 ` tstraus13
2024-04-28 16:34 ` [PR PATCH] [Updated] " tstraus13
2024-04-28 17:29 ` tstraus13
2024-04-28 17:31 ` classabbyamp
2024-04-28 17:54 ` tstraus13
2024-04-28 17:54 ` tstraus13
2024-04-28 18:14 ` [PR PATCH] [Closed]: " classabbyamp
2024-04-28 18:14 ` classabbyamp
2024-04-28 18:15 ` classabbyamp
2024-04-28 18:19 ` tstraus13
2024-04-28 18:35 ` [PR PATCH] [Updated] " tstraus13
2024-04-28 18:37 ` tstraus13
2024-04-28 18:44 ` tstraus13
2024-04-28 18:45 ` tstraus13
2024-04-28 18:48 ` [PR PATCH] [Updated] " tstraus13
2024-05-01 1:47 ` tstraus13
2024-05-01 2:08 ` tstraus13
2024-05-06 18:34 ` tstraus13
2024-05-06 23:14 ` classabbyamp
2024-05-06 23:18 ` tstraus13
2024-05-06 23:20 ` classabbyamp
2024-05-06 23:22 ` tstraus13
2024-05-06 23:25 ` tstraus13
2024-05-06 23:53 ` tstraus13
2024-05-06 23:54 ` streamlink: update to 6.7.3 classabbyamp
2024-05-06 23:57 ` tstraus13
2024-05-07 0:39 ` [PR PATCH] [Updated] " tstraus13
2024-05-07 0:44 ` tstraus13
2024-05-07 0:55 ` classabbyamp
2024-05-07 1:08 ` [PR PATCH] [Updated] " tstraus13
2024-05-07 1:17 ` tstraus13
2024-05-07 1:19 ` tstraus13
2024-05-07 1:26 ` [PR PATCH] [Updated] " tstraus13
2024-05-07 1:29 ` tstraus13
2024-05-07 2:03 ` [PR PATCH] [Closed]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).