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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CBF813933E for ; Thu, 1 Jul 2021 08:43:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C35EE085B; Thu, 1 Jul 2021 08:43:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83F5AE085B for ; Thu, 1 Jul 2021 08:43:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D0ED340817 for ; Thu, 1 Jul 2021 08:43:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCBB77B3 for ; Thu, 1 Jul 2021 08:43:40 +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: <1625129017.ce3e7210621c23e458d74978b19d46e2b9a99690.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jedi/jedi-0.17.2-r1.ebuild dev-python/jedi/jedi-0.18.0.ebuild X-VCS-Directories: dev-python/jedi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ce3e7210621c23e458d74978b19d46e2b9a99690 X-VCS-Branch: master Date: Thu, 1 Jul 2021 08:43:40 +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: 1d976ebf-a802-46b8-bd99-dac0891f45af X-Archives-Hash: 3fd66985ad085524bab061fbadbe778e commit: ce3e7210621c23e458d74978b19d46e2b9a99690 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 1 07:26:56 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 1 08:43:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce3e7210 dev-python/jedi: Port 0.17.2-r1 to py3.10 Signed-off-by: Michał Górny gentoo.org> dev-python/jedi/jedi-0.17.2-r1.ebuild | 41 +++++++++++++++++------------------ dev-python/jedi/jedi-0.18.0.ebuild | 2 ++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild index 2008df3339a..7988373021e 100644 --- a/dev-python/jedi/jedi-0.17.2-r1.ebuild +++ b/dev-python/jedi/jedi-0.17.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 @@ -43,28 +43,27 @@ python_prepare_all() { sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die sed -i "s: --doctest-modules::" pytest.ini || die - # speed tests are fragile - rm test/test_speed.py || die - # test_complete_expanduser relies on $HOME not being empty - touch "${HOME}"/somefile || die + > "${HOME}"/somefile || die - # TODO: investigate - sed -e 's:test_local_import:_&:' \ - -i test/test_utils.py || die - sed -e '/with sqlite3\.connect/,+2d' \ - -i test/completion/stdlib.py || die - rm test/completion/django.py || die + distutils-r1_python_prepare_all +} - # tests relying on pristine virtualenv - # this relies on test* not matching anything else - sed -e "/#\? \['test'\]/,+1d" \ - -i test/completion/on_import.py || die - # this one's broken by 'path' module (dev-python/path-py) - sed -e 's:test_os_issues:_&:' \ - -i test/test_inference/test_imports.py || die - sed -e 's:test_venv_and_pths:_&:' \ - -i test/test_inference/test_sys_path.py || die +python_test() { + local deselect=( + # TODO + 'test/test_integration.py::test_completion[stdlib:155]' + 'test/test_integration.py::test_completion[on_import:29]' + # assume pristine virtualenv + test/test_utils.py::TestSetupReadline::test_local_import + test/test_inference/test_imports.py::test_os_issues + ) + [[ ${EPYTHON} == python3.10 ]] && deselect+=( + # new features increased the match count again + test/test_utils.py::TestSetupReadline::test_import - distutils-r1_python_prepare_all + ) + + # django and pytest tests are very version dependent + epytest ${deselect[@]/#/--deselect } -k "not django and not pytest" } diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild index 65d918b4001..d2d0631a0fd 100644 --- a/dev-python/jedi/jedi-0.18.0.ebuild +++ b/dev-python/jedi/jedi-0.18.0.ebuild @@ -57,6 +57,8 @@ python_test() { # assume pristine virtualenv test/test_utils.py::TestSetupReadline::test_local_import test/test_inference/test_imports.py::test_os_issues + # fragile + test/test_speed.py ) [[ ${EPYTHON} == python3.10 ]] && deselect+=( # new features increased the match count again