[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/files/, dev-python/jedi/
commit: 5e04ceb6a97a9b1b89075d4bf9ac457af6246709 Author: Michał Górny gentoo org> AuthorDate: Sun Jan 8 05:00:51 2023 + Commit: Michał Górny gentoo org> CommitDate: Sun Jan 8 05:06:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e04ceb6 dev-python/jedi: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/jedi/Manifest | 1 - dev-python/jedi/files/jedi-0.18.1-python3.11.patch | 16 - dev-python/jedi/jedi-0.18.1-r1.ebuild | 84 -- 3 files changed, 101 deletions(-) diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest index e95c97ca09c4..a9b20b34903a 100644 --- a/dev-python/jedi/Manifest +++ b/dev-python/jedi/Manifest @@ -1,4 +1,3 @@ DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1 -DIST jedi-0.18.1.gh.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25 DIST jedi-0.18.2.gh.tar.gz 469286 BLAKE2B 6b65a231d092a6869b55c14a8254c4716695f46cdc9733f50607cf7bb8c864f319e2abfbe812bffc514c78cd92059fc29fa9cc0a38b1e14d6bc8bf3ad3596097 SHA512 1df24190c7d468f388e7175f4625670df81cd9a533c8bde12b1e0eaf982a173bdd001bbea6680144cc50ca263fa2b802da5d71de555f81717f4377c46826d0d1 DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa diff --git a/dev-python/jedi/files/jedi-0.18.1-python3.11.patch b/dev-python/jedi/files/jedi-0.18.1-python3.11.patch deleted file mode 100644 index b708881e4f8d.. --- a/dev-python/jedi/files/jedi-0.18.1-python3.11.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/jedi/inference/compiled/subprocess/functions.py b/jedi/inference/compiled/subprocess/functions.py -index 5070c6643..bbc14c392 100644 a/jedi/inference/compiled/subprocess/functions.py -+++ b/jedi/inference/compiled/subprocess/functions.py -@@ -151,7 +151,11 @@ def _find_module(string, path=None, full_name=None, is_global_search=True): - - spec = find_spec(string, p) - if spec is not None: -+if spec.origin == "frozen": -+continue -+ - loader = spec.loader -+ - if loader is None and not spec.has_location: - # This is a namespace package. - full_name = string if not path else full_name diff --git a/dev-python/jedi/jedi-0.18.1-r1.ebuild b/dev-python/jedi/jedi-0.18.1-r1.ebuild deleted file mode 100644 index a0128b79684f.. --- a/dev-python/jedi/jedi-0.18.1-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) - -inherit distutils-r1 - -TYPESHED_P="typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3" -DJANGO_STUBS_P="django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9" - -DESCRIPTION="Autocompletion library for Python" -HOMEPAGE=" - https://github.com/davidhalter/jedi/ - https://pypi.org/project/jedi/ -" -SRC_URI=" - https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.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 -" - -LICENSE=" - MIT - test? ( Apache-2.0 ) -" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - =dev-python/parso-0.8*[${PYTHON_USEDEP}] -" - -PATCHES=( - # https://github.com/davidhalter/jedi/pull/1889 - "${FILESDIR}/${P}-python3.11.patch" -) - -# 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 - -python_prepare_all() { - # 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}"
[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/files/, dev-python/jedi/
commit: e140d3a10f3ed33aefb51c551f62af962a920958 Author: Andrew Ammerlaan gentoo org> AuthorDate: Thu Oct 20 19:56:56 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Oct 20 20:03:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e140d3a1 dev-python/jedi: enable python3.11 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/jedi/Manifest | 1 + dev-python/jedi/files/jedi-0.18.1-python3.11.patch | 16 + dev-python/jedi/jedi-0.18.1-r1.ebuild | 84 ++ 3 files changed, 101 insertions(+) diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest index 88e8d01b0c93..7de7fa4cc6b1 100644 --- a/dev-python/jedi/Manifest +++ b/dev-python/jedi/Manifest @@ -1,3 +1,4 @@ DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1 +DIST jedi-0.18.1.gh.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25 DIST jedi-0.18.1.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25 DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa diff --git a/dev-python/jedi/files/jedi-0.18.1-python3.11.patch b/dev-python/jedi/files/jedi-0.18.1-python3.11.patch new file mode 100644 index ..b708881e4f8d --- /dev/null +++ b/dev-python/jedi/files/jedi-0.18.1-python3.11.patch @@ -0,0 +1,16 @@ +diff --git a/jedi/inference/compiled/subprocess/functions.py b/jedi/inference/compiled/subprocess/functions.py +index 5070c6643..bbc14c392 100644 +--- a/jedi/inference/compiled/subprocess/functions.py b/jedi/inference/compiled/subprocess/functions.py +@@ -151,7 +151,11 @@ def _find_module(string, path=None, full_name=None, is_global_search=True): + + spec = find_spec(string, p) + if spec is not None: ++if spec.origin == "frozen": ++continue ++ + loader = spec.loader ++ + if loader is None and not spec.has_location: + # This is a namespace package. + full_name = string if not path else full_name diff --git a/dev-python/jedi/jedi-0.18.1-r1.ebuild b/dev-python/jedi/jedi-0.18.1-r1.ebuild new file mode 100644 index ..3063ef5c6a18 --- /dev/null +++ b/dev-python/jedi/jedi-0.18.1-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 + +TYPESHED_P="typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3" +DJANGO_STUBS_P="django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9" + +DESCRIPTION="Autocompletion library for Python" +HOMEPAGE=" + https://github.com/davidhalter/jedi/ + https://pypi.org/project/jedi/ +" +SRC_URI=" + https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.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 +" + +LICENSE=" + MIT + test? ( Apache-2.0 ) +" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + =dev-python/parso-0.8*[${PYTHON_USEDEP}] +" + +PATCHES=( + # https://github.com/davidhalter/jedi/pull/1889 + "${FILESDIR}/${P}-python3.11.patch" +) + +# 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 + +python_prepare_all() { + # 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
[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/files/, dev-python/jedi/
commit: ecfe76618891dccb487c3e7de533681f1fb50ee3 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 20 11:38:09 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Aug 20 11:39:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfe7661 dev-python/jedi: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/jedi/Manifest | 1 - dev-python/jedi/files/jedi-0.17.0-tests.patch | 26 - dev-python/jedi/jedi-0.17.0.ebuild| 76 --- 3 files changed, 103 deletions(-) diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest index e686eef9d2d..da3f6c79a8c 100644 --- a/dev-python/jedi/Manifest +++ b/dev-python/jedi/Manifest @@ -1,6 +1,5 @@ DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da 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 7486925cb307f6a25538c2f5d5276380561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977 DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1 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 d045340d093..000 --- 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?= -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 deleted file mode 100644 index 4e89165f9f5..000 --- a/dev-python/jedi/jedi-0.17.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -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 \ - dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( -
[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/files/
commit: 110463e1da863170f9a8b649ddbe677bba8e0dea Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue May 19 19:21:17 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Tue Jun 2 04:28:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110463e1 dev-python/jedi: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Aaron Bauman gentoo.org> dev-python/jedi/files/jedi-0.15.1-tests.patch | 94 --- 1 file changed, 94 deletions(-) diff --git a/dev-python/jedi/files/jedi-0.15.1-tests.patch b/dev-python/jedi/files/jedi-0.15.1-tests.patch deleted file mode 100644 index cdc59053df0..000 --- a/dev-python/jedi/files/jedi-0.15.1-tests.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/test/test_api/test_completion.py b/test/test_api/test_completion.py -index 178daee9..0c86f837 100644 a/test/test_api/test_completion.py -+++ b/test/test_api/test_completion.py -@@ -1,4 +1,5 @@ --from os.path import join, sep as s -+from os.path import join, sep as s, dirname -+import os - import sys - from textwrap import dedent - -@@ -164,6 +165,7 @@ f2 = join(root_dir, 'test', 'example.py') - os_path = 'from os.path import *\n' - # os.path.sep escaped - se = s * 2 if s == '\\' else s -+current_dirname = os.path.basename(dirname(dirname(dirname(__file__ - - - @pytest.mark.parametrize( -@@ -181,7 +183,7 @@ se = s * 2 if s == '\\' else s - ('test%sexample.py' % se, 'r"test%scomp"' % s, 5, ['t' + s]), - ('test%sexample.py' % se, 'r"test%scomp"' % s, 11, ['letion' + s]), - ('test%sexample.py' % se, '"%s"' % join('test', 'completion', 'basi'), 21, ['c.py']), --('example.py', 'rb"' + join('..', 'jedi', 'tes'), None, ['t' + s]), -+('example.py', 'rb"'+ join('..', current_dirname, 'tes'), None, ['t' + s]), - - # Absolute paths - (None, '"' + join(root_dir, 'test', 'test_ca'), None, ['che.py"']), -diff --git a/test/test_evaluate/test_signature.py b/test/test_evaluate/test_signature.py -index 0bb5cbae..2fda3d55 100644 a/test/test_evaluate/test_signature.py -+++ b/test/test_evaluate/test_signature.py -@@ -16,7 +16,7 @@ from jedi.evaluate.gradual.conversion import _stub_to_python_context_set - ('str', "str(object='', /) -> str", ['object'], ge, (2, 7)), - - ('pow', 'pow(x, y, z=None, /) -> number', ['x', 'y', 'z'], lt, (3, 5)), --('pow', 'pow(x, y, z=None, /)', ['x', 'y', 'z'], ge, (3, 5)), -+('pow', 'pow(base, exp, mod=None)', ['base', 'exp', 'mod'], ge, (3, 8)), - - ('bytes.partition', 'partition(self, sep, /) -> (head, sep, tail)', ['self', 'sep'], lt, (3, 5)), - ('bytes.partition', 'partition(self, sep, /)', ['self', 'sep'], ge, (3, 5)), -diff --git a/test/test_evaluate/test_sys_path.py b/test/test_evaluate/test_sys_path.py -index deaa64ca..fdee2ece 100644 a/test/test_evaluate/test_sys_path.py -+++ b/test/test_evaluate/test_sys_path.py -@@ -1,7 +1,9 @@ - import os -+import os.path - from glob import glob - import sys - import shutil -+import distutils.sysconfig - - import pytest - from ..helpers import skip_if_windows, skip_if_not_windows -@@ -33,12 +35,10 @@ def test_venv_and_pths(venv_path): - pjoin = os.path.join - - CUR_DIR = os.path.dirname(__file__) --site_pkg_path = pjoin(venv_path, 'lib') --if os.name == 'nt': --site_pkg_path = pjoin(site_pkg_path, 'site-packages') --else: --site_pkg_path = glob(pjoin(site_pkg_path, 'python*', 'site-packages'))[0] --shutil.rmtree(site_pkg_path) -+site_pkg_path = pjoin(venv_path, -+ distutils.sysconfig.get_python_lib().lstrip(distutils.sysconfig.BASE_PREFIX)) -+if os.path.exists(site_pkg_path): -+shutil.rmtree(site_pkg_path) - shutil.copytree(pjoin(CUR_DIR, 'sample_venvs', 'pth_directory'), site_pkg_path) - - virtualenv = create_environment(venv_path) -diff --git a/test/test_utils.py b/test/test_utils.py -index 17328a36..71217086 100644 a/test/test_utils.py -+++ b/test/test_utils.py -@@ -77,10 +77,14 @@ class TestSetupReadline(unittest.TestCase): - # There are minor differences, e.g. the dir doesn't include deleted - # items as well as items that are not only available on linux. - difference = set(self.completions(s)).symmetric_difference(goal) --difference = {x for x in difference if not x.startswith('from os import _')} -+difference = { -+x for x in difference -+if all(not x.startswith('from os import ' + s) -+ for s in ['_', 'O_', 'EX_', 'MFD_', 'SF_']) -+} - # There are quite a few differences, because both Windows and Linux --# (posix and nt) libraries are included. --assert len(difference) < 38 -+# (posix and nt) librariesare included. -+assert len(difference) < 22 - - @cwd_at('test') - def
[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/files/, dev-python/jedi/
commit: 699064cf32fd7c4ab6025d86f0bc99f646e0bc4f Author: Michał Górny gentoo org> AuthorDate: Wed Apr 15 07:57:12 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Apr 15 08:33:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699064cf dev-python/jedi: Bump to 0.17.0 Signed-off-by: Michał Górny gentoo.org> dev-python/jedi/Manifest | 2 + dev-python/jedi/files/jedi-0.17.0-tests.patch | 26 ++ dev-python/jedi/jedi-0.17.0.ebuild| 72 +++ 3 files changed, 100 insertions(+) diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest index 4e76ed72a11..75d01ed7bdb 100644 --- a/dev-python/jedi/Manifest +++ b/dev-python/jedi/Manifest @@ -1,4 +1,6 @@ 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 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 000..d045340d093 --- /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?= +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 000..ec64254f90c --- /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 + ) + +
[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/files/, dev-python/jedi/
commit: b11d03f2d92770a7be0c34a2549680304bd20af8 Author: Michał Górny gentoo org> AuthorDate: Fri Mar 27 16:19:01 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri Mar 27 16:29:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11d03f2 dev-python/jedi: Remove redundant versions Signed-off-by: Michał Górny gentoo.org> dev-python/jedi/Manifest | 4 -- .../jedi/files/jedi-0.11.1-exclude-tests.patch | 26 - dev-python/jedi/jedi-0.10.2.ebuild | 44 --- dev-python/jedi/jedi-0.11.1.ebuild | 51 -- dev-python/jedi/jedi-0.12.0.ebuild | 46 dev-python/jedi/jedi-0.12.1.ebuild | 63 -- 6 files changed, 234 deletions(-) diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest index 97610ddd6cc..4e76ed72a11 100644 --- a/dev-python/jedi/Manifest +++ b/dev-python/jedi/Manifest @@ -1,7 +1,3 @@ -DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351 -DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945 -DIST jedi-0.12.0.tar.gz 354329 BLAKE2B ef203f2ba57a90de1e16b80c8786fa25d6d459244873dfb22044aa6d080435efa976daeb80949c3fba41ca2f57feb5bfed255b3bb490e17b40b3f13dfbb31e14 SHA512 3e8280b16855cf2c891666f0fb02ac30d801279b72b5bcb64541ef7c152d9f9b165015405ee291cbccd6c9cb3c0481c24f30e6100cb4463888153021b946f16d -DIST jedi-0.12.1.tar.gz 356736 BLAKE2B 515cbc27e065c24fb2cebae5a3807d2e025f22110f3de60d26a74475eadc985bb32bea60b691c580473fffe2fdfc86705187dea1fb730ef3f510b7bdb52e0d59 SHA512 92f9ac34abf908a8143dff360400dd8d6643dc3502bb7973f92bd05db94c2af151c2063f2de0481a14e26d11c009cc39c46189e1ea31d274b80802e3a10cd665 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 diff --git a/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch b/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch deleted file mode 100644 index a85af80d4c9..000 --- a/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4e52acbf26b6d52e26e757cb04817d17c5464331 Mon Sep 17 00:00:00 2001 -From: Dave Halter -Date: Sun, 7 Jan 2018 14:13:21 +0100 -Subject: [PATCH] Using setup.py build should not include part of tests - -It looks like that we have to not only exclude the test package but also 'test.*'. Thanks to @david-geiger for noticing this. Fixes #1024. - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3f3b7e54..c7081858 100755 a/setup.py -+++ b/setup.py -@@ -32,7 +32,7 @@ setup(name='jedi', - license='MIT', - keywords='python completion refactoring vim', - long_description=readme, -- packages=find_packages(exclude=['test']), -+ packages=find_packages(exclude=['test', 'test.*']), - install_requires=install_requires, - extras_require={'dev': ['docopt']}, - package_data={'jedi': ['evaluate/compiled/fake/*.pym']}, --- -2.16.1 - diff --git a/dev-python/jedi/jedi-0.10.2.ebuild b/dev-python/jedi/jedi-0.10.2.ebuild deleted file mode 100644 index 545a27e4779..000 --- a/dev-python/jedi/jedi-0.10.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit distutils-r1 - -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" - -LICENSE="MIT"