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 5DAF715800F for ; Sun, 19 Feb 2023 19:46:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5231E097B; Sun, 19 Feb 2023 19:46:39 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E0FFE097B for ; Sun, 19 Feb 2023 19:46:39 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6255335C94 for ; Sun, 19 Feb 2023 19:46:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 000B68BB for ; Sun, 19 Feb 2023 19:46:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1676835980.0a8b9367a2cdcf49814e4d8c48efbe0196d56f2b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/kiwisolver/files/, dev-python/kiwisolver/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild X-VCS-Directories: dev-python/kiwisolver/ dev-python/kiwisolver/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0a8b9367a2cdcf49814e4d8c48efbe0196d56f2b X-VCS-Branch: master Date: Sun, 19 Feb 2023 19:46:35 +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: 55558c32-4d9c-4747-8814-c191aad514e0 X-Archives-Hash: a7dfe7f6456b21c61330f532b340f6fc commit: 0a8b9367a2cdcf49814e4d8c48efbe0196d56f2b Author: Jérôme Carretero zougloub eu> AuthorDate: Fri Feb 17 19:07:08 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 19 19:46:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8b9367 dev-python/kiwisolver: add pypy3 to PYTHON_COMPAT Signed-off-by: Jérôme Carretero zougloub.eu> Signed-off-by: Michał Górny gentoo.org> .../files/kiwisolver-1.4.4-pypy3-tests.patch | 30 +++++++++++++++ dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild | 44 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch new file mode 100644 index 000000000000..705855f02f61 --- /dev/null +++ b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch @@ -0,0 +1,30 @@ +Patch provided upstream as https://github.com/nucleic/kiwi/pull/158 +from issue created at https://github.com/nucleic/kiwi/issues/157 + +commit ad1c62f046dc14c1e85e4e1c1b8e175eda08838e +Author: Jérôme Carretero +Date: Fri Feb 17 18:40:45 2023 -0500 + + py: tests: make tests run under PyPy + +diff --git a/py/tests/test_expression.py b/py/tests/test_expression.py +index 671dd7f..6b5d8e5 100644 +--- a/py/tests/test_expression.py ++++ b/py/tests/test_expression.py +@@ -8,6 +8,7 @@ + import gc + import math + import operator ++import sys + from typing import Tuple + + import pytest +@@ -264,4 +265,7 @@ def test_expression_rich_compare_operations(op, symbol) -> None: + else: + with pytest.raises(TypeError) as excinfo: + op(e1, e2) +- assert "kiwisolver.Expression" in excinfo.exconly() ++ if "PyPy" in sys.version: ++ assert "Expression" in excinfo.exconly() ++ else: ++ assert "kiwisolver.Expression" in excinfo.exconly() diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild new file mode 100644 index 000000000000..67d18ec3f1e7 --- /dev/null +++ b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} pypy3 ) + +inherit distutils-r1 + +MY_P=kiwi-${PV} +DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm" +HOMEPAGE=" + https://github.com/nucleic/kiwi/ + https://pypi.org/project/kiwisolver/ +" +SRC_URI=" + https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Clear-BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +COMMON_DEPEND=" + >=dev-python/cppy-1.2.0[${PYTHON_USEDEP}] +" + +RDEPEND=" + ${COMMON_DEPEND} +" +BDEPEND=" + ${COMMON_DEPEND} + >=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.4-pypy3-tests.patch" +) + +distutils_enable_tests pytest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}