gentoo resync : 25.04.2020

3 files changed, 102 insertions, 0 deletions

diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index aea5474ba7bd..6d78fc286c4a 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,9 +1,13 @@
 AUX jedi-0.15.1-tests.patch 4110 BLAKE2B 3e99d214fa218bc2488aaad1a9d7bad16f26f0bcea07b96b4d8a5ae162df799a5747987961dac602186507015297183e81efc90bfc1dc6cf27585ab739629fc6 SHA512 394dcee9577a62abdc7a6c074c79fa801b0dbe04796d17333fcafd1344567d3c4f741d202e3d7929f23236f854a888b94679e1d061488967d621a37b1229a188
+AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
 DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.1.tar.gz 412356 BLAKE2B a7738e8825b3f578db5e64d50cbf65219b4d2f2f81c45cbae9e3dbb858b0e1ef26d76972c112bfae839daaf73bba0d00b30b5708404d16b0385452500a1c2d35 SHA512 0f6e0185f3f10dbc000f09ddfed7b9596fe5dc270682544173dc156d505618ea14f1f44ede5d2357745ab8ded0b15b2788d064ca4db39fe70196982dd0a16893
 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 typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
+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.1.ebuild 1888 BLAKE2B e61208594a9825809dd6069baee3fbf9867742b1aafd42ea6b61a151d44f62329986faec7b8f26e58e4b0449ad55cc9061481b16bf43d1f1a413c16af042cc21 SHA512 49566fb478ca4d726abf7babf14d6887aa1dab3e6c9afc0a77a58069ea691ef42570fb9f2b98952592edd0c54cce8959e71676bbbf23e0ff340a9f3b54d3bd5b
 EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
+EBUILD jedi-0.17.0.ebuild 2005 BLAKE2B 80a8a63e814a8a4128fb0cdebca8aaf6080fd3abdd84230205005a5028658976eba1e9d0e633254c24f3bbae178e11ef8445f6caa593ef3b0432caef6a327f11 SHA512 c5dd4a269ce360fe780a02d7297faee4e47ddb0a3b32912a6eecce8a80e2ff41b4a5b3c38fd64b3b6caaba8c085e931b0744097181a404e99282389f32b1ab72
 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
new file mode 100644
index 000000000000..d045340d0930
--- /dev/null
+++ b/dev-python/jedi/files/jedi-0.17.0-tests.patch
@@ -0,0 +1,26 @@
+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.17.0.ebuild b/dev-python/jedi/jedi-0.17.0.ebuild
new file mode 100644
index 000000000000..ec64254f90cb
--- /dev/null
+++ b/dev-python/jedi/jedi-0.17.0.ebuild
@@ -0,0 +1,72 @@
+# 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="0.16.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() {
+	local PATCHES=(
+		"${FILESDIR}"/jedi-0.17.0-tests.patch
+	)
+
+	# 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_complete_expanduser relies on $HOME not being empty
+	touch "${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
+
+	# really silly assumptions, not fit for py3.8
+	sed -e '/len(difference)/s:20:22:' \
+		-i test/test_utils.py || die
+
+	# 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
+
+	distutils-r1_python_prepare_all
+}