gentoo resync : 25.08.2020

6 files changed, 16 insertions, 185 deletions

diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index d36d7576f01c..796c562b9fe3 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,13 +1,7 @@
-AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
-DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
-DIST jedi-0.17.0.tar.gz 462810 BLAKE2B 71eeb3e3fa23786c577fbcb3727a49111d6188c2a5d9e13538123c7c6817b67d457f3bb88423dc9dac6ee09dec89d7281c86166bc771fa0215cd327a4432ebd7 SHA512 562ae25f0c4709cfe36fe4e737d383190d8ad435b3ff580b9fbe966544c8d035cfa29815459ceecfafd704547560a8dc397f841989043e6e18c8f9d639f75399
 DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
-DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
+DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
-EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
-EBUILD jedi-0.17.0.ebuild 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f
-EBUILD jedi-0.17.1.ebuild 2128 BLAKE2B 60c917667bc22722fceef83013626559f4d82ae11e47b5617195b68fd7fc693769a2d340c79ec9bbf24885c6e530091aeb5ac39238a6652e898277f602b1de3f SHA512 b3e17e5a1d984bee6aad5bc1727b71d03011cfaf82f5fb6e6974d512a7d399ef266b14791d6b0b0bb71e5e1c2df127a0d3f50b498325b2bab0148e3050f7ce18
+EBUILD jedi-0.17.1-r1.ebuild 2126 BLAKE2B 7408c92262a1ae88537be1e29c464a78755b2e72f922db863acf4424b0009fe3ca1da19f9953bec21d73018724064088352994ebf09d5d340b6ca7e21c7acea9 SHA512 3c42bf871e9336b4948d716efde466f683d3ff932d955dbe3fcbdd7a8d925dc6f34f3d75d054e5f5bfbf0073d80a717a22898d4ace2cf5503e59ff6439d4be42
+EBUILD jedi-0.17.2-r1.ebuild 2122 BLAKE2B 024075a30fd86c3299a0e3a53f67fb2a2b1d86ed66b16105b9d4d50ab2896b39f8b1b48e738ea0827d7dac994579ef79de9e61808b520c33051361c10b11491f SHA512 8be3d7c4985a1ac7e71ccade2f3b74cab705ee70cab85c8e1e2e3455731c430c8949ced57c90d40f2275f2ce992ea641d9346fdc0d2056e643bdfc3f6f8c1f6e
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/files/jedi-0.17.0-tests.patch b/dev-python/jedi/files/jedi-0.17.0-tests.patch
deleted file mode 100644
index d045340d0930..000000000000
--- a/dev-python/jedi/files/jedi-0.17.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 57f2a731d2e5c4fe5794d823154983e44e8df003 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 15 Apr 2020 07:54:01 +0200
-Subject: [PATCH] Sort test_project::test_search results to fix failures
-
-Fixes #1542
----
- test/test_api/test_project.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_api/test_project.py b/test/test_api/test_project.py
-index a7d4846e..c21579a5 100644
---- a/test/test_api/test_project.py
-+++ b/test/test_api/test_project.py
-@@ -135,7 +135,7 @@ def test_search(string, full_names, kwargs, skip_pre_python36):
-         defs = project.complete_search(string, **kwargs)
-     else:
-         defs = project.search(string, **kwargs)
--    assert [('stub:' if d.is_stub() else '') + d.full_name for d in defs] == full_names
-+    assert sorted([('stub:' if d.is_stub() else '') + d.full_name for d in defs]) == full_names
- 
- 
- @pytest.mark.parametrize(
--- 
-2.26.0
-
diff --git a/dev-python/jedi/jedi-0.14.1.ebuild b/dev-python/jedi/jedi-0.14.1.ebuild
deleted file mode 100644
index 6f023f45fc8a..000000000000
--- a/dev-python/jedi/jedi-0.14.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="dev-python/parso[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# speed tests are fragile
-	rm test/test_speed.py || die
-
-	# 'path' completion test does not account for 'path' being a valid
-	# package (i.e. dev-python/path-py)
-	# https://github.com/davidhalter/jedi/issues/1210
-	sed -i -e 's:test_get_modules_containing_name:_&:' \
-		test/test_evaluate/test_imports.py || die
-	sed -i -e 's:test_os_issues:_&:' \
-		test/test_evaluate/test_imports.py || die
-	sed -i -e 's:test_os_issues:_&:' \
-		test/test_api/test_full_name.py || die
-	sed -i -e 's:test_os_nowait:_&:' \
-		test/test_api/test_full_name.py || die
-	sed -i -e 's:test_os_nowait:_&:' \
-		test/test_api/test_completion.py || die
-	sed -i -e 's:test_import:_&:' \
-		test/test_utils.py || die
-
-	# don't run doctests, don't depend on colorama
-	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
-	sed -i "s: --doctest-modules::" pytest.ini || die
-
-	# no clue why it fails but we don't really care about .pyc files
-	# without sources anyway
-	rm test/test_evaluate/test_pyc.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} = python3.6 ]]; then
-		# our very useful patching changes libdir for no good reason
-		sed -i -e 's:test_venv_and_pths:_&:' \
-			test/test_evaluate/test_sys_path.py || die
-	fi
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jedi/jedi-0.15.2.ebuild b/dev-python/jedi/jedi-0.15.2.ebuild
deleted file mode 100644
index 3cd8bc1d3369..000000000000
--- a/dev-python/jedi/jedi-0.15.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-TYPESHED_PV="$(ver_cut 1-2).0"
-TYPESHED_P="typeshed-jedi_v${TYPESHED_PV}"
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/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"
-
-LICENSE="MIT
-	test? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# upstream includes this as a submodule ...
-	rmdir "${S}/jedi/third_party/typeshed" || die
-	mv "${WORKDIR}/${TYPESHED_P}" \
-		"${S}/jedi/third_party/typeshed" || die
-
-	# don't run doctests, don't depend on colorama
-	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 <IntegrationTestCase: /var/tmp/portage/dev-python/jedi-0.15.2/work/jedi-0.15.2/test/completion/stdlib.py:194 '    c'> failed.
-	rm test/completion/stdlib.py || die
-
-	# Test <IntegrationTestCase: /var/tmp/portage/dev-python/jedi-0.15.2/work/jedi-0.15.2/test/completion/on_import.py:27 'import test'> failed.
-	rm test/completion/on_import.py || die
-
-	# ValueError: Should not happen. type: del_stmt
-	rm test/test_utils.py || die
-
-	# KeyError: ((), frozenset())
-	sed -i -e 's:test_os_nowait:_&:' test/test_api/test_completion.py || die
-	sed -i -e 's:test_os_issues:_&:' test/test_api/test_full_name.py || die
-
-	# AssertionError: assert 'staticmethod(f: Callable)' == 'staticmethod(f: Callable[..., Any])'
-	sed -i -e 's:test_staticmethod:_&:' test/test_api/test_signatures.py || die
-
-	# AssertionError: assert 'path' not in ['abc', 'aifc', 'aiocontextvars', 'aiohttp', 'aiohttp_cors', 'aiounittest', ...]
-	sed -i -e 's:test_os_issues:_&:' test/test_inference/test_imports.py || die
-
-	# ValueError: not enough values to unpack (expected 2, got 1)
-	sed -i -e 's:test_get_modules_containing_name:_&:' test/test_inference/test_docstring.py || die
-
-	# AssertionError
-	sed -i -e 's:test_venv_and_pths:_&:' test/test_inference/test_sys_path.py || die
-
-	# AssertionError
-	sed -i -e 's:test_get_typeshed_directories:_&:' test/test_inference/test_gradual/test_typeshed.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jedi/jedi-0.17.1.ebuild b/dev-python/jedi/jedi-0.17.1-r1.ebuild
index 00e52e0a5408..60aa2d557a20 100644
--- a/dev-python/jedi/jedi-0.17.1.ebuild
+++ b/dev-python/jedi/jedi-0.17.1-r1.ebuild
@@ -25,7 +25,7 @@ LICENSE="MIT
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
+RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/jedi/jedi-0.17.0.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
index e8e830ee68ec..f0eb683638b9 100644
--- a/dev-python/jedi/jedi-0.17.0.ebuild
+++ b/dev-python/jedi/jedi-0.17.2-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
-TYPESHED_PV="0.16.0"
-TYPESHED_P="typeshed-jedi_v${TYPESHED_PV}"
+TYPESHED_P="typeshed-jedi_v0.16.0"
+DJANGO_STUBS_P="django-stubs-v1.5.0"
 
 DESCRIPTION="Autocompletion library for Python"
 HOMEPAGE="https://github.com/davidhalter/jedi"
@@ -16,26 +16,26 @@ 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"
+		-> ${TYPESHED_P}.tar.gz
+	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+		-> ${DJANGO_STUBS_P/v/}.tar.gz"
 
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
-RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
+RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/jedi-0.17.0-tests.patch
-	)
-
-	# upstream includes this as a submodule ...
-	rmdir "${S}/jedi/third_party/typeshed" || die
+	# upstream includes these as submodules ...
+	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+		"${S}/jedi/third_party/django-stubs" || die
 	mv "${WORKDIR}/${TYPESHED_P}" \
 		"${S}/jedi/third_party/typeshed" || die
 
@@ -54,13 +54,7 @@ python_prepare_all() {
 		-i test/test_utils.py || die
 	sed -e '/with sqlite3\.connect/,+2d' \
 		-i test/completion/stdlib.py || die
-
-	# really silly assumptions, not fit for py3.8/3.9
-	sed -e '/len(difference)/s:20:27:' \
-		-i test/test_utils.py || die
-	# py3.9
-	sed -e 's:test_infer_on_generator:_&:' \
-		-i test/test_api/test_api.py || die
+	rm test/completion/django.py || die
 
 	# tests relying on pristine virtualenv
 	# this relies on test* not matching anything else