* [PR PATCH] streamlink: update to 6.7.3
@ 2024-10-20 1:36 tstraus13
2024-10-20 1:38 ` [PR PATCH] [Updated] streamlink: update to 6.11.0 tstraus13
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: tstraus13 @ 2024-10-20 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
There is a new pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages master
https://github.com/void-linux/void-packages/pull/52697
streamlink: update to 6.7.3
The patch is no longer required. Upstream removed the need for the python-exceptiongroup dependency along with the python3-pytest-asycio dependency.
#### Testing the changes
- I tested the changes in this PR: **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/52697.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-52697.patch --]
[-- Type: text/x-diff, Size: 5354 bytes --]
From da53d5105c2b1fb40b732e0af7e43c29b7909de2 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sat, 19 Oct 2024 21:26:44 -0400
Subject: [PATCH] streamlink: update to 6.7.3
The patch is no longer required. Upstream removed the need for the
python-exceptiongroup dependency along with the python3-pytest-asycio
dependency.
---
srcpkgs/streamlink/patches/streamlink.patch | 102 --------------------
srcpkgs/streamlink/template | 6 +-
2 files changed, 3 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
deleted file mode 100644
index 5b260226d73126..00000000000000
--- a/srcpkgs/streamlink/patches/streamlink.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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 18006c720eb3e1..21e912ace4c419 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=6.7.3
+version=6.11.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
@@ -8,14 +8,14 @@ depends="python3-lxml python3-pycryptodome python3-pycountry
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"
short_desc="Utility extracting streams from services, forked from livestreamer"
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=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
+checksum=562e5d753ca109e1956207de4ac27c337ce6b99fbe7ed7203b945105ed5b2f86
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.11.0
2024-10-20 1:36 [PR PATCH] streamlink: update to 6.7.3 tstraus13
@ 2024-10-20 1:38 ` tstraus13
2024-10-26 23:20 ` tstraus13
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: tstraus13 @ 2024-10-20 1:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages master
https://github.com/void-linux/void-packages/pull/52697
streamlink: update to 6.11.0
The patch is no longer required. Upstream removed the need for the python-exceptiongroup dependency along with the python3-pytest-asycio dependency.
#### Testing the changes
- I tested the changes in this PR: **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/52697.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-52697.patch --]
[-- Type: text/x-diff, Size: 5355 bytes --]
From 0396249320e0788a9886c12d65afa61991f77163 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sat, 19 Oct 2024 21:26:44 -0400
Subject: [PATCH] streamlink: update to 6.11.0
The patch is no longer required. Upstream removed the need for the
python-exceptiongroup dependency along with the python3-pytest-asycio
dependency.
---
srcpkgs/streamlink/patches/streamlink.patch | 102 --------------------
srcpkgs/streamlink/template | 6 +-
2 files changed, 3 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
deleted file mode 100644
index 5b260226d73126..00000000000000
--- a/srcpkgs/streamlink/patches/streamlink.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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 18006c720eb3e1..21e912ace4c419 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=6.7.3
+version=6.11.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
@@ -8,14 +8,14 @@ depends="python3-lxml python3-pycryptodome python3-pycountry
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"
short_desc="Utility extracting streams from services, forked from livestreamer"
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=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
+checksum=562e5d753ca109e1956207de4ac27c337ce6b99fbe7ed7203b945105ed5b2f86
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.11.0
2024-10-20 1:36 [PR PATCH] streamlink: update to 6.7.3 tstraus13
2024-10-20 1:38 ` [PR PATCH] [Updated] streamlink: update to 6.11.0 tstraus13
@ 2024-10-26 23:20 ` tstraus13
2024-10-26 23:29 ` tstraus13
2024-10-26 23:31 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: tstraus13 @ 2024-10-26 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages master
https://github.com/void-linux/void-packages/pull/52697
streamlink: update to 6.11.0
The patch is no longer required. Upstream removed the need for the python-exceptiongroup dependency along with the python3-pytest-asycio dependency.
#### Testing the changes
- I tested the changes in this PR: **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/52697.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-52697.patch --]
[-- Type: text/x-diff, Size: 5355 bytes --]
From 0396249320e0788a9886c12d65afa61991f77163 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sat, 19 Oct 2024 21:26:44 -0400
Subject: [PATCH] streamlink: update to 6.11.0
The patch is no longer required. Upstream removed the need for the
python-exceptiongroup dependency along with the python3-pytest-asycio
dependency.
---
srcpkgs/streamlink/patches/streamlink.patch | 102 --------------------
srcpkgs/streamlink/template | 6 +-
2 files changed, 3 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
deleted file mode 100644
index 5b260226d73126..00000000000000
--- a/srcpkgs/streamlink/patches/streamlink.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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 18006c720eb3e1..21e912ace4c419 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=6.7.3
+version=6.11.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
@@ -8,14 +8,14 @@ depends="python3-lxml python3-pycryptodome python3-pycountry
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"
short_desc="Utility extracting streams from services, forked from livestreamer"
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=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
+checksum=562e5d753ca109e1956207de4ac27c337ce6b99fbe7ed7203b945105ed5b2f86
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] streamlink: update to 6.11.0
2024-10-20 1:36 [PR PATCH] streamlink: update to 6.7.3 tstraus13
2024-10-20 1:38 ` [PR PATCH] [Updated] streamlink: update to 6.11.0 tstraus13
2024-10-26 23:20 ` tstraus13
@ 2024-10-26 23:29 ` tstraus13
2024-10-26 23:31 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: tstraus13 @ 2024-10-26 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by tstraus13 against master on the void-packages repository
https://github.com/tstraus13/void-packages master
https://github.com/void-linux/void-packages/pull/52697
streamlink: update to 6.11.0
The patch is no longer required. Upstream removed the need for the python-exceptiongroup dependency along with the python3-pytest-asycio dependency.
#### Testing the changes
- I tested the changes in this PR: **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/52697.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-52697.patch --]
[-- Type: text/x-diff, Size: 5355 bytes --]
From 0396249320e0788a9886c12d65afa61991f77163 Mon Sep 17 00:00:00 2001
From: Tom Strausbaugh <tstrausbaugh@straustech.net>
Date: Sat, 19 Oct 2024 21:26:44 -0400
Subject: [PATCH] streamlink: update to 6.11.0
The patch is no longer required. Upstream removed the need for the
python-exceptiongroup dependency along with the python3-pytest-asycio
dependency.
---
srcpkgs/streamlink/patches/streamlink.patch | 102 --------------------
srcpkgs/streamlink/template | 6 +-
2 files changed, 3 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/streamlink/patches/streamlink.patch
diff --git a/srcpkgs/streamlink/patches/streamlink.patch b/srcpkgs/streamlink/patches/streamlink.patch
deleted file mode 100644
index 5b260226d73126..00000000000000
--- a/srcpkgs/streamlink/patches/streamlink.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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 18006c720eb3e1..21e912ace4c419 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
# Template file for 'streamlink'
pkgname=streamlink
-version=6.7.3
+version=6.11.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-versioningit"
@@ -8,14 +8,14 @@ depends="python3-lxml python3-pycryptodome python3-pycountry
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"
short_desc="Utility extracting streams from services, forked from livestreamer"
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=0daf89f8d3975be9f9e4bbda3d0c3a5e24612494383dce19d69db5a8cca6fd7c
+checksum=562e5d753ca109e1956207de4ac27c337ce6b99fbe7ed7203b945105ed5b2f86
make_check_pre="env PYTHONPATH=src"
make_check=ci-skip # some tests fail when running as root
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: streamlink: update to 6.11.0
2024-10-20 1:36 [PR PATCH] streamlink: update to 6.7.3 tstraus13
` (2 preceding siblings ...)
2024-10-26 23:29 ` tstraus13
@ 2024-10-26 23:31 ` classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2024-10-26 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
There's a merged pull request on the void-packages repository
streamlink: update to 6.11.0
https://github.com/void-linux/void-packages/pull/52697
Description:
The patch is no longer required. Upstream removed the need for the python-exceptiongroup dependency along with the python3-pytest-asycio dependency.
#### Testing the changes
- I tested the changes in this PR: **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] 5+ messages in thread
end of thread, other threads:[~2024-10-26 23:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-20 1:36 [PR PATCH] streamlink: update to 6.7.3 tstraus13
2024-10-20 1:38 ` [PR PATCH] [Updated] streamlink: update to 6.11.0 tstraus13
2024-10-26 23:20 ` tstraus13
2024-10-26 23:29 ` tstraus13
2024-10-26 23:31 ` [PR PATCH] [Merged]: " 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).