From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F313715800F for ; Sat, 18 Feb 2023 02:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06B6BE0824; Sat, 18 Feb 2023 02:09:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E04BFE0824 for ; Sat, 18 Feb 2023 02:09:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC834340F5A for ; Sat, 18 Feb 2023 02:09:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E43E75 for ; Sat, 18 Feb 2023 02:09:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1676686157.f2a9993afbc4a4ced0c2a03a57e52515e2d4e4cf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/, media-video/subliminal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/subliminal/files/subliminal-2.1.0-rarfile-4.0-compat.patch media-video/subliminal/subliminal-2.1.0-r2.ebuild media-video/subliminal/subliminal-9999.ebuild X-VCS-Directories: media-video/subliminal/ media-video/subliminal/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f2a9993afbc4a4ced0c2a03a57e52515e2d4e4cf X-VCS-Branch: master Date: Sat, 18 Feb 2023 02:09:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8965fd9a-77f8-4227-a71a-07af6be63c67 X-Archives-Hash: 489d15e37322f1d842f0675745403329 commit: f2a9993afbc4a4ced0c2a03a57e52515e2d4e4cf Author: Sam James gentoo org> AuthorDate: Sat Feb 18 01:53:18 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 18 02:09:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a9993a media-video/subliminal: enable py3.11, use PEP517, fix runtime w/ rarfile Signed-off-by: Sam James gentoo.org> .../subliminal-2.1.0-rarfile-4.0-compat.patch | 25 ++++++++++++++++++++++ ...inal-9999.ebuild => subliminal-2.1.0-r2.ebuild} | 20 ++++++++--------- media-video/subliminal/subliminal-9999.ebuild | 20 ++++++++--------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/media-video/subliminal/files/subliminal-2.1.0-rarfile-4.0-compat.patch b/media-video/subliminal/files/subliminal-2.1.0-rarfile-4.0-compat.patch new file mode 100644 index 000000000000..55b8b9484808 --- /dev/null +++ b/media-video/subliminal/files/subliminal-2.1.0-rarfile-4.0-compat.patch @@ -0,0 +1,25 @@ +https://github.com/Diaoul/subliminal/pull/1045 + +From e9ed47e61a63ad0e0cdb036375ffa5a144953f1e Mon Sep 17 00:00:00 2001 +From: Eduardo Soares +Date: Fri, 24 Dec 2021 17:08:04 +0000 +Subject: [PATCH] Fix removal of custom check from rarfile dependency + +--- + subliminal/providers/legendastv.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/subliminal/providers/legendastv.py b/subliminal/providers/legendastv.py +index 9d696ca24..bf57a22dc 100644 +--- a/subliminal/providers/legendastv.py ++++ b/subliminal/providers/legendastv.py +@@ -161,7 +161,7 @@ def __init__(self, username=None, password=None): + + # Provider needs UNRAR installed. If not available raise ConfigurationError + try: +- rarfile.custom_check([rarfile.UNRAR_TOOL], True) ++ rarfile.tool_setup(True, False, False, True) + except rarfile.RarExecError: + raise ConfigurationError('UNRAR tool not available') + + diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-2.1.0-r2.ebuild similarity index 85% copy from media-video/subliminal/subliminal-9999.ebuild copy to media-video/subliminal/subliminal-2.1.0-r2.ebuild index 792931859484..a3c58afc2d5e 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-2.1.0-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE='xml(+)' -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_BRANCH="develop" else SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Python library to search and download subtitles" @@ -50,7 +51,8 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-2.1.0-fix-pytest-warning.patch" + "${FILESDIR}"/${P}-fix-pytest-warning.patch + "${FILESDIR}"/${PN}-2.1.0-rarfile-4.0-compat.patch ) distutils_enable_tests pytest @@ -80,16 +82,14 @@ python_prepare_all() { } python_test() { - local skipped_tests=( + EPYTEST_DESELECT=( tests/test_core.py::test_scan_archive_with_one_video tests/test_core.py::test_scan_archive_with_multiple_videos tests/test_core.py::test_scan_archive_with_no_video tests/test_core.py::test_scan_password_protected_archive + # NotImplementedError + tests/test_core.py::test_save_subtitles ) - # Two tests that list providers rely on entry points - # so they need the package to be installed - distutils_install_for_testing - pytest -vv --ignore ${PN}/test/test_core.py ${skipped_tests[@]/#/--deselect } \ - || die "Tests fail with ${EPYTHON}" + epytest } diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild index 792931859484..a3c58afc2d5e 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE='xml(+)' -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_BRANCH="develop" else SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Python library to search and download subtitles" @@ -50,7 +51,8 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-2.1.0-fix-pytest-warning.patch" + "${FILESDIR}"/${P}-fix-pytest-warning.patch + "${FILESDIR}"/${PN}-2.1.0-rarfile-4.0-compat.patch ) distutils_enable_tests pytest @@ -80,16 +82,14 @@ python_prepare_all() { } python_test() { - local skipped_tests=( + EPYTEST_DESELECT=( tests/test_core.py::test_scan_archive_with_one_video tests/test_core.py::test_scan_archive_with_multiple_videos tests/test_core.py::test_scan_archive_with_no_video tests/test_core.py::test_scan_password_protected_archive + # NotImplementedError + tests/test_core.py::test_save_subtitles ) - # Two tests that list providers rely on entry points - # so they need the package to be installed - distutils_install_for_testing - pytest -vv --ignore ${PN}/test/test_core.py ${skipped_tests[@]/#/--deselect } \ - || die "Tests fail with ${EPYTHON}" + epytest }