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 8A01D158091 for ; Sat, 18 Jun 2022 09:31:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 867B8E088F; Sat, 18 Jun 2022 09:31:30 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64648E088F for ; Sat, 18 Jun 2022 09:31:30 +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 396AC3419A5 for ; Sat, 18 Jun 2022 09:31:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C0FA471 for ; Sat, 18 Jun 2022 09:31:27 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1655544347.c743b0bd2072fb0ad2a7d82fb5e1115265937af0.ionen@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: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c743b0bd2072fb0ad2a7d82fb5e1115265937af0 X-VCS-Branch: master Date: Sat, 18 Jun 2022 09:31: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: 35d3f0e2-e248-4a57-849c-148226a4f00b X-Archives-Hash: 33394ad9cdbe9c1b4c828f71eb0210d3 commit: c743b0bd2072fb0ad2a7d82fb5e1115265937af0 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Jun 18 07:31:22 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jun 18 09:25:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c743b0bd dev-util/maturin: revert drive-by style changes >From 51a6052911456321df1622458f3586d232d6784b, keeping pypy3. Signed-off-by: Ionen Wolkens gentoo.org> dev-util/maturin/maturin-0.12.20.ebuild | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dev-util/maturin/maturin-0.12.20.ebuild b/dev-util/maturin/maturin-0.12.20.ebuild index 50a55d370a94..220a3fe60583 100644 --- a/dev-util/maturin/maturin-0.12.20.ebuild +++ b/dev-util/maturin/maturin-0.12.20.ebuild @@ -303,8 +303,7 @@ 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 @@ -326,12 +325,9 @@ 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=( pypy3 python3_{8..11} ) - inherit cargo distutils-r1 flag-o-matic DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings" @@ -339,13 +335,11 @@ 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" @@ -354,8 +348,7 @@ 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 ) @@ -365,8 +358,7 @@ BDEPEND=" ' 'python*') dev-python/boltons[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - ) -" + )" QA_FLAGS_IGNORED=".*/${PN}" @@ -408,18 +400,16 @@ python_test() { local -x PIP_CONFIG_FILE=${T}/pip.conf local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1 - local skips=( + local skip=( # 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 - ) + [[ ${EPYTHON} == pypy3 ]] && skip+=( --skip integration_pyo3_bin ) cp -r test-crates{.orig,} || die - cargo_src_test -- "${skips[@]}" + cargo_src_test -- "${skip[@]}" rm -r test-crates || die }