From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- dev-python/jedi/Manifest | 3 +- dev-python/jedi/files/jedi-0.15.1-tests.patch | 94 --------------------------- dev-python/jedi/jedi-0.17.0.ebuild | 12 ++-- 3 files changed, 9 insertions(+), 100 deletions(-) delete mode 100644 dev-python/jedi/files/jedi-0.15.1-tests.patch (limited to 'dev-python/jedi') diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest index c4633c71d86b..7b835144a9f8 100644 --- a/dev-python/jedi/Manifest +++ b/dev-python/jedi/Manifest @@ -1,4 +1,3 @@ -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.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e @@ -7,5 +6,5 @@ DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd3 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 2005 BLAKE2B 80a8a63e814a8a4128fb0cdebca8aaf6080fd3abdd84230205005a5028658976eba1e9d0e633254c24f3bbae178e11ef8445f6caa593ef3b0432caef6a327f11 SHA512 c5dd4a269ce360fe780a02d7297faee4e47ddb0a3b32912a6eecce8a80e2ff41b4a5b3c38fd64b3b6caaba8c085e931b0744097181a404e99282389f32b1ab72 +EBUILD jedi-0.17.0.ebuild 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c 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 cdc59053df03..000000000000 --- 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 test_local_import(self): diff --git a/dev-python/jedi/jedi-0.17.0.ebuild b/dev-python/jedi/jedi-0.17.0.ebuild index ec64254f90cb..e8e830ee68ec 100644 --- a/dev-python/jedi/jedi-0.17.0.ebuild +++ b/dev-python/jedi/jedi-0.17.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit distutils-r1 @@ -25,7 +25,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]" -distutils_enable_sphinx docs +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme distutils_enable_tests pytest python_prepare_all() { @@ -54,9 +55,12 @@ python_prepare_all() { 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:' \ + # 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 # tests relying on pristine virtualenv # this relies on test* not matching anything else -- cgit v1.2.3