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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 924C11382C5 for ; Sat, 20 Jun 2020 00:26:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE549E083E; Sat, 20 Jun 2020 00:26:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55F13E0833 for ; Sat, 20 Jun 2020 00:26:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0172E34F0C0 for ; Sat, 20 Jun 2020 00:26:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D1372A0 for ; Sat, 20 Jun 2020 00:26:02 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1592612554.bfd5201292c3193c416b4c946b044a27b3927bec.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/subliminal/subliminal-9999.ebuild X-VCS-Directories: media-video/subliminal/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: bfd5201292c3193c416b4c946b044a27b3927bec X-VCS-Branch: master Date: Sat, 20 Jun 2020 00:26:02 +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: 13e0bf1e-ddfa-4855-806a-f26d1b09175d X-Archives-Hash: 61b84906c75456743a27fe31996a351f commit: bfd5201292c3193c416b4c946b044a27b3927bec Author: Sam James (sam_c) cmpct info> AuthorDate: Sat Jun 6 03:20:23 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sat Jun 20 00:22:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd52012 media-video/subliminal: Sync live Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Aaron Bauman gentoo.org> media-video/subliminal/subliminal-9999.ebuild | 28 +++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild index 13b314d12fb..3043809fda4 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-9999.ebuild @@ -3,8 +3,9 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE='xml(+)' +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 git-r3 @@ -17,6 +18,8 @@ SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip LICENSE="MIT" SLOT="0" KEYWORDS="" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/appdirs-1.3[${PYTHON_USEDEP}] @@ -32,11 +35,10 @@ RDEPEND=" >=dev-python/pytz-2012c[${PYTHON_USEDEP}] >=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}] >=dev-python/requests-2.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/six-1.9.0[${PYTHON_USEDEP}] >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] " -DEPEND=" +BDEPEND=" test? ( app-arch/unzip dev-python/sympy[${PYTHON_USEDEP}] @@ -44,6 +46,10 @@ DEPEND=" ) " +PATCHES=( + "${FILESDIR}/${PN}-2.1.0-fix-pytest-warning.patch" +) + distutils_enable_tests pytest src_unpack() { @@ -54,7 +60,6 @@ src_unpack() { python_prepare_all() { # Disable code checkers as they require unavailable dependencies. sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die - sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die # Disable unconditional dependency on dev-python/pytest-runner. sed -i -e "s|'pytest-runner'||g" setup.py || die @@ -66,3 +71,18 @@ python_prepare_all() { distutils-r1_python_prepare_all } + +python_test() { + local skipped_tests=( + 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 + ) + + # 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}" +}