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 BD67C158089 for ; Thu, 16 Nov 2023 19:43:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 996B22BC016; Thu, 16 Nov 2023 19:43:44 +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 7D5462BC016 for ; Thu, 16 Nov 2023 19:43:44 +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 88FC2335D77 for ; Thu, 16 Nov 2023 19:43:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AAFE1399 for ; Thu, 16 Nov 2023 19:43:42 +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: <1700163814.7f026c9eb22677a29cccef6a3eec2b04d6516798.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/ipython/ipython-8.17.2.ebuild X-VCS-Directories: dev-python/ipython/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7f026c9eb22677a29cccef6a3eec2b04d6516798 X-VCS-Branch: master Date: Thu, 16 Nov 2023 19:43:42 +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: 58c0b24b-e114-43a4-a555-e4ebc0f075b8 X-Archives-Hash: 2849b6816c401b10a137d8edbb8c551b commit: 7f026c9eb22677a29cccef6a3eec2b04d6516798 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 16 19:40:49 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 16 19:43:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f026c9e dev-python/ipython: Enable pypy3 Sponsored-by: Ex Makhina, Inc. exmakhina.com> Signed-off-by: Michał Górny gentoo.org> dev-python/ipython/ipython-8.17.2.ebuild | 67 +++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/dev-python/ipython/ipython-8.17.2.ebuild b/dev-python/ipython/ipython-8.17.2.ebuild index 5dfde618be12..c9fc67b54133 100644 --- a/dev-python/ipython/ipython-8.17.2.ebuild +++ b/dev-python/ipython/ipython-8.17.2.ebuild @@ -4,8 +4,9 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE='readline,sqlite,threads(+)' +PYTHON_FULL=( python3_{10..12} ) +PYTHON_COMPAT=( "${PYTHON_FULL[@]}" pypy3 ) +PYTHON_REQ_USE='readline(+),sqlite,threads(+)' inherit distutils-r1 optfeature pypi virtualx @@ -40,20 +41,24 @@ RDEPEND=" BDEPEND=" test? ( app-text/dvipng[truetype] - >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/matplotlib-inline[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/nbformat[${PYTHON_USEDEP}] + ' "${PYTHON_FULL[@]}") >=dev-python/numpy-1.22[${PYTHON_USEDEP}] + dev-python/matplotlib-inline[${PYTHON_USEDEP}] dev-python/pickleshare[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/testpath[${PYTHON_USEDEP}] ) doc? ( - >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/sphinx-2[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/sphinx-2[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ' "${PYTHON_FULL[@]}") ) " @@ -61,23 +66,29 @@ distutils_enable_tests pytest RDEPEND+=" nbconvert? ( - dev-python/nbconvert[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/nbconvert[${PYTHON_USEDEP}] + ' "${PYTHON_FULL[@]}") ) " PDEPEND=" - notebook? ( - dev-python/notebook[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/widgetsnbextension[${PYTHON_USEDEP}] - ) - qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) - smp? ( - >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] - >=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + notebook? ( + dev-python/notebook[${PYTHON_USEDEP}] + dev-python/ipywidgets[${PYTHON_USEDEP}] + dev-python/widgetsnbextension[${PYTHON_USEDEP}] + ) + qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) + smp? ( + >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] + >=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}] + ) + ' "${PYTHON_FULL[@]}") " -PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch ) +PATCHES=( + "${FILESDIR}"/2.1.0-substitute-files.patch +) python_prepare_all() { # Remove out of date insource files @@ -97,7 +108,7 @@ python_prepare_all() { } python_compile_all() { - if use doc; then + if use doc && has "${EPYTHON/./_}" "${PYTHON_FULL[@]}"; then emake -C docs html_noapi HTML_DOCS=( docs/build/html/. ) fi @@ -115,6 +126,16 @@ python_test() { IPython/core/tests/test_oinspect.py::test_render_signature_long IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters ) + + case ${EPYTHON} in + pypy3) + EPYTEST_DESELECT+=( + # https://github.com/numpy/numpy/issues/25164 + IPython/lib/tests/test_display.py::TestAudioDataWithoutNumpy + ) + ;; + esac + # nonfatal implied by virtx nonfatal epytest || die "Tests failed with ${EPYTHON}" }