commit: 283595b6412ed6f27d759968a9597c31edf0767f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 22 23:48:01 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 23 00:27:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=283595b6
net-misc/streamlink: drop 6.7.2-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/streamlink/Manifest | 1 - .../files/streamlink-6.7.2-validator.patch | 61 ------------ net-misc/streamlink/streamlink-6.7.2-r1.ebuild | 102 --------------------- 3 files changed, 164 deletions(-) diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 2050187b073c..bdbeffa41e75 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,3 +1,2 @@ -DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e563605ef16fb3adebba03194ad3f1d8f9dc902cfe80372dc53c5778f1ddc9695680b5cd4a87277b646fc15fffd7e2 SHA512 251e0b03c39dae980367e8a5b6ffcb1c279b0874eeaeff31d9d4486917b759ef27ba2bd5bba0bc74691237e429981f3748002e0ef49befe8c7be69160856ecfe DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65 DIST streamlink-6.7.4.tar.gz 744387 BLAKE2B bd8fb9af560fbe164a63fd1b698100765c716b44b6f3364e6ad072f69d0fdee9d22dd0fda6c297f249915c9a60f10e2089228a8c19244a7ef18b5809632bf96a SHA512 266c66626624814d708a228d4e2e62c443c3973fb139632a88086619c755fa80d97fad077a2a7383f9beb3e2f4464274beb0bb446b85f6f63d6704a88a9c2e29 diff --git a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch deleted file mode 100644 index 8dc69d62616a..000000000000 --- a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch +++ /dev/null @@ -1,61 +0,0 @@ -https://github.com/streamlink/streamlink/pull/5932 -https://github.com/streamlink/streamlink/commit/0466622dc0bd13db972f6a00d2e2bda31ad50229 - -Quoting the PR: -""" -Since Python 3.11.9 / 3.12.3 / 3.13.0a6, urllib.parse.parse_qsl() now raises a TypeError -if the input is not a str, is truthy and can't be passed to memoryview(), like integers for example, -hence the test failure which previously just checked an invalid input to that validation schema. -""" - -From 51c13ddd45f83384cf7800a881127ad74dec3bb8 Mon Sep 17 00:00:00 2001 -From: bastimeyer <m...@bastimeyer.de> -Date: Tue, 9 Apr 2024 21:36:03 +0200 -Subject: [PATCH] plugin.api.validate: check parse_qsd() input type - ---- - src/streamlink/plugin/api/validate/_validators.py | 6 +++++- - tests/test_api_validate.py | 11 +++++++++-- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/streamlink/plugin/api/validate/_validators.py b/src/streamlink/plugin/api/validate/_validators.py -index 69135b74919..e99d305733f 100644 ---- a/src/streamlink/plugin/api/validate/_validators.py -+++ b/src/streamlink/plugin/api/validate/_validators.py -@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema: - :raise ValidationError: On parsing error - """ - -- return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None) -+ def parser(*_args, **_kwargs): -+ validate(AnySchema(str, bytes), _args[0]) -+ return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None) -+ -+ return TransformSchema(parser, *args, **kwargs) -diff --git a/tests/test_api_validate.py b/tests/test_api_validate.py -index ceff9bc1dde..c328116d27b 100644 ---- a/tests/test_api_validate.py -+++ b/tests/test_api_validate.py -@@ -1343,13 +1343,20 @@ def test_success(self): - validate.parse_qsd(), - "foo=bar&foo=baz&qux=quux", - ) == {"foo": "baz", "qux": "quux"} -+ assert validate.validate( -+ validate.parse_qsd(), -+ b"foo=bar&foo=baz&qux=quux", -+ ) == {b"foo": b"baz", b"qux": b"quux"} - - def test_failure(self): - with pytest.raises(ValidationError) as cm: - validate.validate(validate.parse_qsd(), 123) - assert_validationerror(cm.value, """ -- ValidationError: -- Unable to parse query string: 'int' object has no attribute 'decode' (123) -+ ValidationError(AnySchema): -+ ValidationError(type): -+ Type of 123 should be str, but is int -+ ValidationError(type): -+ Type of 123 should be bytes, but is int - """) - - diff --git a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild deleted file mode 100644 index 73d54972af03..000000000000 --- a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"; - inherit git-r3 -fi - -DISTUTILS_SINGLE_IMPL=1 -# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools -# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE='xml(+),threads(+)' -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/"; - -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"; -fi - -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep -# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep -RDEPEND=" - media-video/ffmpeg - $(python_gen_cond_dep ' - dev-python/certifi[${PYTHON_USEDEP}] - || ( - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/charset-normalizer[${PYTHON_USEDEP}] - ) - dev-python/exceptiongroup[${PYTHON_USEDEP}] - >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] - dev-python/isodate[${PYTHON_USEDEP}] - >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] - >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] - >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] - >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/setuptools-64[${PYTHON_USEDEP}] - >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] - test? ( - >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-trio[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - ) - ') -" - -if [[ ${PV} == 9999* ]]; then - RDEPEND+=" - $(python_gen_cond_dep ' - >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] - ') - " -fi - -PATCHES=( - "${FILESDIR}"/${P}-validator.patch -) - -distutils_enable_tests pytest - -python_test() { - # Skip tests requiring <dev-python/pytest-8.0.0 which is currently masked - # https://github.com/streamlink/streamlink/pull/5901 - EPYTEST_DESELECT+=( - tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception - tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error - tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach - tests/webbrowser/cdp/test_client.py::TestNavigate::test_error - tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure - tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json - tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id - 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' - 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' - tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command - tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception - tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error - tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result - ) - - epytest -}
