1 |
commit: 110463e1da863170f9a8b649ddbe677bba8e0dea |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue May 19 19:21:17 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 2 04:28:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110463e1 |
7 |
|
8 |
dev-python/jedi: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
12 |
|
13 |
dev-python/jedi/files/jedi-0.15.1-tests.patch | 94 --------------------------- |
14 |
1 file changed, 94 deletions(-) |
15 |
|
16 |
diff --git a/dev-python/jedi/files/jedi-0.15.1-tests.patch b/dev-python/jedi/files/jedi-0.15.1-tests.patch |
17 |
deleted file mode 100644 |
18 |
index cdc59053df0..00000000000 |
19 |
--- a/dev-python/jedi/files/jedi-0.15.1-tests.patch |
20 |
+++ /dev/null |
21 |
@@ -1,94 +0,0 @@ |
22 |
-diff --git a/test/test_api/test_completion.py b/test/test_api/test_completion.py |
23 |
-index 178daee9..0c86f837 100644 |
24 |
---- a/test/test_api/test_completion.py |
25 |
-+++ b/test/test_api/test_completion.py |
26 |
-@@ -1,4 +1,5 @@ |
27 |
--from os.path import join, sep as s |
28 |
-+from os.path import join, sep as s, dirname |
29 |
-+import os |
30 |
- import sys |
31 |
- from textwrap import dedent |
32 |
- |
33 |
-@@ -164,6 +165,7 @@ f2 = join(root_dir, 'test', 'example.py') |
34 |
- os_path = 'from os.path import *\n' |
35 |
- # os.path.sep escaped |
36 |
- se = s * 2 if s == '\\' else s |
37 |
-+current_dirname = os.path.basename(dirname(dirname(dirname(__file__)))) |
38 |
- |
39 |
- |
40 |
- @pytest.mark.parametrize( |
41 |
-@@ -181,7 +183,7 @@ se = s * 2 if s == '\\' else s |
42 |
- ('test%sexample.py' % se, 'r"test%scomp"' % s, 5, ['t' + s]), |
43 |
- ('test%sexample.py' % se, 'r"test%scomp"' % s, 11, ['letion' + s]), |
44 |
- ('test%sexample.py' % se, '"%s"' % join('test', 'completion', 'basi'), 21, ['c.py']), |
45 |
-- ('example.py', 'rb"' + join('..', 'jedi', 'tes'), None, ['t' + s]), |
46 |
-+ ('example.py', 'rb"'+ join('..', current_dirname, 'tes'), None, ['t' + s]), |
47 |
- |
48 |
- # Absolute paths |
49 |
- (None, '"' + join(root_dir, 'test', 'test_ca'), None, ['che.py"']), |
50 |
-diff --git a/test/test_evaluate/test_signature.py b/test/test_evaluate/test_signature.py |
51 |
-index 0bb5cbae..2fda3d55 100644 |
52 |
---- a/test/test_evaluate/test_signature.py |
53 |
-+++ b/test/test_evaluate/test_signature.py |
54 |
-@@ -16,7 +16,7 @@ from jedi.evaluate.gradual.conversion import _stub_to_python_context_set |
55 |
- ('str', "str(object='', /) -> str", ['object'], ge, (2, 7)), |
56 |
- |
57 |
- ('pow', 'pow(x, y, z=None, /) -> number', ['x', 'y', 'z'], lt, (3, 5)), |
58 |
-- ('pow', 'pow(x, y, z=None, /)', ['x', 'y', 'z'], ge, (3, 5)), |
59 |
-+ ('pow', 'pow(base, exp, mod=None)', ['base', 'exp', 'mod'], ge, (3, 8)), |
60 |
- |
61 |
- ('bytes.partition', 'partition(self, sep, /) -> (head, sep, tail)', ['self', 'sep'], lt, (3, 5)), |
62 |
- ('bytes.partition', 'partition(self, sep, /)', ['self', 'sep'], ge, (3, 5)), |
63 |
-diff --git a/test/test_evaluate/test_sys_path.py b/test/test_evaluate/test_sys_path.py |
64 |
-index deaa64ca..fdee2ece 100644 |
65 |
---- a/test/test_evaluate/test_sys_path.py |
66 |
-+++ b/test/test_evaluate/test_sys_path.py |
67 |
-@@ -1,7 +1,9 @@ |
68 |
- import os |
69 |
-+import os.path |
70 |
- from glob import glob |
71 |
- import sys |
72 |
- import shutil |
73 |
-+import distutils.sysconfig |
74 |
- |
75 |
- import pytest |
76 |
- from ..helpers import skip_if_windows, skip_if_not_windows |
77 |
-@@ -33,12 +35,10 @@ def test_venv_and_pths(venv_path): |
78 |
- pjoin = os.path.join |
79 |
- |
80 |
- CUR_DIR = os.path.dirname(__file__) |
81 |
-- site_pkg_path = pjoin(venv_path, 'lib') |
82 |
-- if os.name == 'nt': |
83 |
-- site_pkg_path = pjoin(site_pkg_path, 'site-packages') |
84 |
-- else: |
85 |
-- site_pkg_path = glob(pjoin(site_pkg_path, 'python*', 'site-packages'))[0] |
86 |
-- shutil.rmtree(site_pkg_path) |
87 |
-+ site_pkg_path = pjoin(venv_path, |
88 |
-+ distutils.sysconfig.get_python_lib().lstrip(distutils.sysconfig.BASE_PREFIX)) |
89 |
-+ if os.path.exists(site_pkg_path): |
90 |
-+ shutil.rmtree(site_pkg_path) |
91 |
- shutil.copytree(pjoin(CUR_DIR, 'sample_venvs', 'pth_directory'), site_pkg_path) |
92 |
- |
93 |
- virtualenv = create_environment(venv_path) |
94 |
-diff --git a/test/test_utils.py b/test/test_utils.py |
95 |
-index 17328a36..71217086 100644 |
96 |
---- a/test/test_utils.py |
97 |
-+++ b/test/test_utils.py |
98 |
-@@ -77,10 +77,14 @@ class TestSetupReadline(unittest.TestCase): |
99 |
- # There are minor differences, e.g. the dir doesn't include deleted |
100 |
- # items as well as items that are not only available on linux. |
101 |
- difference = set(self.completions(s)).symmetric_difference(goal) |
102 |
-- difference = {x for x in difference if not x.startswith('from os import _')} |
103 |
-+ difference = { |
104 |
-+ x for x in difference |
105 |
-+ if all(not x.startswith('from os import ' + s) |
106 |
-+ for s in ['_', 'O_', 'EX_', 'MFD_', 'SF_']) |
107 |
-+ } |
108 |
- # There are quite a few differences, because both Windows and Linux |
109 |
-- # (posix and nt) libraries are included. |
110 |
-- assert len(difference) < 38 |
111 |
-+ # (posix and nt) librariesare included. |
112 |
-+ assert len(difference) < 22 |
113 |
- |
114 |
- @cwd_at('test') |
115 |
- def test_local_import(self): |