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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4FF2B158092 for ; Wed, 1 Jun 2022 05:03:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F565E084A; Wed, 1 Jun 2022 05:03:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1FB0E084A for ; Wed, 1 Jun 2022 05:03:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9617F341C12 for ; Wed, 1 Jun 2022 05:03:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 861FF4E7 for ; Wed, 1 Jun 2022 05:03:02 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1654059765.50debcbf2f1e588edb4f3710aac5463909ec5149.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/psautohint/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/psautohint/Manifest dev-util/psautohint/psautohint-2.4.0.ebuild X-VCS-Directories: dev-util/psautohint/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 50debcbf2f1e588edb4f3710aac5463909ec5149 X-VCS-Branch: dev Date: Wed, 1 Jun 2022 05:03: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: 17bdc718-2059-4093-bf3d-70cc03c63236 X-Archives-Hash: 870865e66b43c38e4d5e14c98a2f73df commit: 50debcbf2f1e588edb4f3710aac5463909ec5149 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Jun 1 01:50:18 2022 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Wed Jun 1 05:02:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50debcbf dev-util/psautohint: fix tests Closes: https://bugs.gentoo.org/816507 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-util/psautohint/Manifest | 2 +- dev-util/psautohint/psautohint-2.4.0.ebuild | 33 +++++++++++++++++------------ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dev-util/psautohint/Manifest b/dev-util/psautohint/Manifest index 34b1b4a4e..1463268e7 100644 --- a/dev-util/psautohint/Manifest +++ b/dev-util/psautohint/Manifest @@ -1,2 +1,2 @@ -DIST psautohint-2.4.0.tar.gz 181009 BLAKE2B bb6ed5ae6b800742d8d1061004bfb49a84e3b9c99977a653ef8eeccf38d9c03261be5b735df20ee93dcf712b8b6ade7a2391937f327206fc2e01f2b5bcbe9022 SHA512 dfc29d020bedf8bd546e395743befb390e9fb01a3025aa10357a32724c9a78236acd57e05300aa26be630c9d43edab8bda731dc4f51c0a07d0bef79112d952aa +DIST psautohint-2.4.0.gh.tar.gz 181009 BLAKE2B bb6ed5ae6b800742d8d1061004bfb49a84e3b9c99977a653ef8eeccf38d9c03261be5b735df20ee93dcf712b8b6ade7a2391937f327206fc2e01f2b5bcbe9022 SHA512 dfc29d020bedf8bd546e395743befb390e9fb01a3025aa10357a32724c9a78236acd57e05300aa26be630c9d43edab8bda731dc4f51c0a07d0bef79112d952aa DIST psautohint-testdata-1e4c5061d328105c4dcfcb6fdbc27ec49b3e9d23.tar.gz 21949984 BLAKE2B a5da67eb4b9f3d0ce5d86469bc0a5f771fa743198836db35121e9c62b66c8b8df00fef6e40e8832e33aee065fe3bdd0a24d1b590bce6fb66d7c43f6719236242 SHA512 03d4962958d3551ffdf99463d28723f6b43d42029843da1b40493b0bfc2e586ebf40db3a2497b36b5fde345de4b6998cfc1131c6fb4e8352b05fb59fc4e90e7f diff --git a/dev-util/psautohint/psautohint-2.4.0.ebuild b/dev-util/psautohint/psautohint-2.4.0.ebuild index 675b06317..9d1dc2d01 100644 --- a/dev-util/psautohint/psautohint-2.4.0.ebuild +++ b/dev-util/psautohint/psautohint-2.4.0.ebuild @@ -16,9 +16,9 @@ HOMEPAGE=" https://pypi.org/project/psautohint/ " SRC_URI=" - https://github.com/adobe-type-tools/psautohint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/adobe-type-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz test? ( - https://github.com/adobe-type-tools/psautohint-testdata/archive/${COMMIT}.tar.gz -> psautohint-testdata-${COMMIT}.tar.gz + https://github.com/adobe-type-tools/${PN}-testdata/archive/${COMMIT}.tar.gz -> psautohint-testdata-${COMMIT}.tar.gz ) " KEYWORDS="~amd64" @@ -32,7 +32,6 @@ RDEPEND=" dev-python/fs[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-bininpath.diff" @@ -40,6 +39,15 @@ PATCHES=( "${FILESDIR}/${PN}-2.3.0-no-werror.patch" ) +EPYTEST_DESELECT=( + tests/integration/test_hint.py::test_hashmap_old_version + tests/integration/test_hint.py::test_mute_tx_msgs + tests/integration/test_hint.py::test_type1_supported + tests/integration/test_mmhint.py::test_vfotf + tests/integration/test_cli.py::test_multi_outpath + tests/integration/test_cli.py::test_multi_different_formats +) + distutils_enable_tests pytest pkg_setup() { @@ -50,9 +58,14 @@ pkg_setup() { src_unpack() { default - if [ -d "${WORKDIR}/psautohint-testdata-${COMMIT}" ]; then - mv "${WORKDIR}/psautohint-testdata-${COMMIT}"/* "${S}/tests/integration/data/" || die - fi + mv "${WORKDIR}"/psautohint-testdata-${COMMIT}/* "${S}"/tests/integration/data || die +} + +python_prepare_all() { + # error: unrecognized arguments: -n + sed "/^ /d" -i pytest.ini || die + + distutils-r1_python_prepare_all } src_configure() { @@ -80,11 +93,5 @@ python_test() { local -x PATH="${BUILD_DIR}/test/scripts:${MESON_BUILD_DIR}l:${PATH}" local -x LD_LIBRARY_PATH="${MESON_BUILD_DIR}" distutils_install_for_testing - epytest -vv \ - --deselect tests/integration/test_hint.py::test_hashmap_old_version \ - --deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/CJKSparseVar.subset.hinted.otf] \ - --deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/bug816.hinted.otf] \ - --deselect tests/integration/test_cli.py::test_multi_outpath \ - --deselect tests/integration/test_cli.py::test_multi_different_formats \ - || die + epytest }