gentoo resync : 12.05.2022

3 files changed, 47 insertions, 29 deletions

diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 5d3f75ecd7b7..d2aae3690069 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,7 +1,9 @@
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
+DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
+DIST jedi-0.18.1.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25
+DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.17.2-r1.ebuild 2121 BLAKE2B 6b47d973eb02888d7236ccf8cdf742a619f553790d5ff09e5e3fd18bba90e9efc9f4366f64db3248beb2cbed19258a65113bfc2f3ab54298cf36c92ed06e31d7 SHA512 ae267b4f42f698999532f72cecc81eff862b85f0695ee26b855a6fd63f289ed3ed8f7af33fa0342220030927a42459260d32a00350018ee98c173535ef43b562
-EBUILD jedi-0.18.0.ebuild 2199 BLAKE2B a11399ad1a086f204941b98eabc14246fbcc476c5d7c7ec478661aeff7bdcffdfcbf432e19ac8e3c19b68c41e206ca50762788e872c5d72b69b49042b66a4bff SHA512 15c4e6de575fc78ce3770c48a334fb8ffca554f2e7b259a9427747bcfb8907ab87053518e45cebf15acd768e646b98e4793b294f940a8eb4dfab5d459084bc6a
+EBUILD jedi-0.18.0.ebuild 2481 BLAKE2B 30334950169a5fadec676f806dab2560f77c30613a892814adf7bcfad81cb8ea70fa73ba5ab545b50dbd7c0ddae10940cbb2f3a780d6d18e5f3a6e111dc048f9 SHA512 807a4df4b642123e99ab87578a7089dc561dc0429e3ed9714da25ad95a6dbc3a69afee37d882fce4be793ddcd0433a33f010f99dea25b5fb38f4385f6eb0e94b
+EBUILD jedi-0.18.1.ebuild 2209 BLAKE2B 4ec2d97467890a32af6def8b55521d0d689cc7912209b7b2c4a455f2643806b742733663d5b38443849745961fb25a298c508ad02793002e902a7047fe544f1f SHA512 119a1d21372df1cd15ff36f7fcec63cdc7d19a5a5ee47881502414bfb160bd0daa318e875362b78e53574be2cc520997d8652b207c2b3833e4e5b00931f8716b
 MISC metadata.xml 401 BLAKE2B c540d55ee88ab5a7be9ec902059a766a754da42ba5c1836c990d0d64edfec91fa33e8a745b9a15ce4a97831259150e0298fe2a5ed4c21993be73d9fd7af3d865 SHA512 6af98463225428333ec509b334014bd307569ce852f640a1f1c1e18f7551185d8db9b7c80822012c14f3c6ca1cf79ff24f289df3cd42803759d012a1a73ac07c
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index ae592db2a559..59d2c1396385 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,22 +52,30 @@ python_prepare_all() {
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		# TODO
 		'test/test_integration.py::test_completion[stdlib:155]'
 		'test/test_integration.py::test_completion[on_import:29]'
+		# pytest?
+		'test/test_integration.py::test_completion[conftest:27]'
 		# 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+=(
+	[[ ${EPYTHON} != python3.8 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		'test/test_integration.py::test_completion[lambdas:112]'
+	)
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
 		# new features increased the match count again
 		test/test_utils.py::TestSetupReadline::test_import
 
 	)
 
+	# some plugin breaks case-insensitivity on completions
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	# django and pytest tests are very version dependent
-	epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
+	epytest -k "not django and not pytest"
 }
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.18.1.ebuild
index d49d1ea8809d..695103134ebb 100644
--- a/dev-python/jedi/jedi-0.17.2-r1.ebuild
+++ b/dev-python/jedi/jedi-0.18.1.ebuild
@@ -1,33 +1,44 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
+TYPESHED_P="typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3"
+DJANGO_STUBS_P="django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9"
 
 DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
+HOMEPAGE="
+	https://github.com/davidhalter/jedi/
+	https://pypi.org/project/jedi/
+"
 SRC_URI="
 	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz
 	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
 		-> ${TYPESHED_P}.tar.gz
 	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
-		-> ${DJANGO_STUBS_P/v/}.tar.gz"
+		-> ${DJANGO_STUBS_P/v/}.tar.gz
+"
 
-LICENSE="MIT
-	test? ( Apache-2.0 )"
+LICENSE="
+	MIT
+	test? ( Apache-2.0 )
+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
+RDEPEND="
+	=dev-python/parso-0.8*[${PYTHON_USEDEP}]
+"
 
+# RDEPEND needed because of an import jedi inside conf.py
 distutils_enable_sphinx docs \
+	dev-python/parso \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
@@ -50,22 +61,19 @@ python_prepare_all() {
 }
 
 python_test() {
-	local deselect=(
-		# TODO
-		'test/test_integration.py::test_completion[stdlib:197]'
-		'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
+	local EPYTEST_DESELECT=(
 		# fragile
 		test/test_speed.py
+		# assumes pristine virtualenv
+		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
-
+	[[ ${EPYTHON} != python3.8 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		'test/test_integration.py::test_completion[lambdas:112]'
 	)
 
+	# some plugin breaks case-insensitivity on completions
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	# django and pytest tests are very version dependent
-	epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
+	epytest -k "not django and not pytest"
 }