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 482BB158091 for ; Sat, 18 Jun 2022 06:47:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0F29E08FE; Sat, 18 Jun 2022 06:47:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6EA91E08FE for ; Sat, 18 Jun 2022 06:47:24 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B543341EC1 for ; Sat, 18 Jun 2022 06:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9A8951E for ; Sat, 18 Jun 2022 06:47:19 +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: <1655534833.51a6052911456321df1622458f3586d232d6784b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/maturin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/maturin/maturin-0.12.20.ebuild X-VCS-Directories: dev-util/maturin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 51a6052911456321df1622458f3586d232d6784b X-VCS-Branch: master Date: Sat, 18 Jun 2022 06:47:19 +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: 276e7aa4-dc63-4311-b4dd-f158178bb63b X-Archives-Hash: 627238914c9c9be24dcd4cd008ac9509 commit: 51a6052911456321df1622458f3586d232d6784b Author: Michał Górny gentoo org> AuthorDate: Sat Jun 18 06:37:53 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jun 18 06:47:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a60529 dev-util/maturin: Enable pypy3 Signed-off-by: Michał Górny gentoo.org> dev-util/maturin/maturin-0.12.20.ebuild | 46 +++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dev-util/maturin/maturin-0.12.20.ebuild b/dev-util/maturin/maturin-0.12.20.ebuild index 119a4031e96b..50a55d370a94 100644 --- a/dev-util/maturin/maturin-0.12.20.ebuild +++ b/dev-util/maturin/maturin-0.12.20.ebuild @@ -303,7 +303,8 @@ CRATES=" zbus_macros-1.9.1 zip-0.6.2 zvariant-2.10.0 - zvariant_derive-2.10.0" + zvariant_derive-2.10.0 +" CRATES_TEST=" libc-0.2.119 libc-0.2.125 @@ -325,9 +326,12 @@ CRATES_TEST=" target-lexicon-0.12.3 unicode-ident-1.0.0 unicode-xid-0.2.3 - unindent-0.1.9" + unindent-0.1.9 +" + DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( pypy3 python3_{8..11} ) + inherit cargo distutils-r1 flag-o-matic DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings" @@ -335,11 +339,13 @@ HOMEPAGE="https://maturin.rs/" SRC_URI=" https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz $(cargo_crate_uris) - test? ( $(cargo_crate_uris ${CRATES_TEST}) )" + test? ( $(cargo_crate_uris ${CRATES_TEST}) ) +" LICENSE=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl - doc? ( CC-BY-4.0 OFL-1.1 )" + doc? ( CC-BY-4.0 OFL-1.1 ) +" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc test" @@ -348,15 +354,19 @@ RESTRICT="!test? ( test )" RDEPEND=" $(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{8..10})" + ' 3.{8..10}) +" BDEPEND=" dev-python/setuptools-rust[${PYTHON_USEDEP}] doc? ( app-text/mdbook ) test? ( - dev-python/cffi[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') dev-python/boltons[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - )" + ) +" QA_FLAGS_IGNORED=".*/${PN}" @@ -389,14 +399,28 @@ python_compile_all() { use !doc || mdbook build -d html guide || die } +src_test() { + mv test-crates{,.orig} || die + distutils-r1_src_test +} + python_test() { local -x PIP_CONFIG_FILE=${T}/pip.conf local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1 - # pyo3_no_extension_module is xfail but passes with >=rust-1.60, still - # need looking into but is not known to cause issues, disable for now. - cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \ + local skips=( + # pyo3_no_extension_module is xfail but passes with >=rust-1.60, still + # need looking into but is not known to cause issues, disable for now. + --skip locked_doesnt_build_without_cargo_lock --skip pyo3_no_extension_module + ) + [[ ${EPYTHON} == pypy3 ]] && skips+=( + --skip integration_pyo3_bin + ) + + cp -r test-crates{.orig,} || die + cargo_src_test -- "${skips[@]}" + rm -r test-crates || die } python_install_all() {