From 5fd953c67c9a3e218672501618984ac888939527b3c9ff0c7a6edd1c91b7b51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 14 Mar 2020 10:28:59 +0000 Subject: [PATCH 1/4] - Update to version v0.16.0+git54.0888dd46: * Fix partialmethod issues * Make sure partialmethod tests are only executed for Python 3 * Refactor stdlib PartialObject * Fix PartialMethodObject (WIP) * Changed semantics of ClassVar attributes in classes, fixes #1502 * Avoid duplicate definitions for goto, fixes #1514 * Merge _remove_statements and infer_expr_stmt, fixes #1504 * Add partialmethod, fixes #1519 * Attempt at a test of completion of filepath after ~. * Complete path after ~. - Remove patches from git in preparation to switch to git service: * delete.patch * typing.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jedi?expand=0&rev=58 --- _service | 15 ++++++++++ delete.patch | 43 ----------------------------- jedi-0.16.0.tar.gz | 3 -- jedi-v0.16.0+git54.0888dd46.obscpio | 3 ++ jedi.obsinfo | 5 ++++ python-jedi.changes | 22 +++++++++++++++ python-jedi.spec | 8 ++---- typing.patch | 17 ------------ 8 files changed, 47 insertions(+), 69 deletions(-) create mode 100644 _service delete mode 100644 delete.patch delete mode 100644 jedi-0.16.0.tar.gz create mode 100644 jedi-v0.16.0+git54.0888dd46.obscpio create mode 100644 jedi.obsinfo delete mode 100644 typing.patch diff --git a/_service b/_service new file mode 100644 index 0000000..5dee8c2 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/davidhalter/jedi.git + git + master + @PARENT_TAG@+git@TAG_OFFSET@.%h + enable + + + + + *.tar + xz + + diff --git a/delete.patch b/delete.patch deleted file mode 100644 index 1b03d68..0000000 --- a/delete.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bec87f7ff82b0731713c6520a14c213341b4cecf Mon Sep 17 00:00:00 2001 -From: Dave Halter -Date: Sun, 26 Jan 2020 20:07:25 +0100 -Subject: [PATCH] Jedi understand now when you use del, fixes #313 - ---- - test/completion/basic.py | 6 +++--- - test/test_api/test_full_name.py | 3 ++- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/test/completion/basic.py b/test/completion/basic.py -index b40068179..3ff919ca6 100644 ---- a/test/completion/basic.py -+++ b/test/completion/basic.py -@@ -209,11 +209,11 @@ def global_as_import(): - - deleted_var = 3 - del deleted_var --#? int() -+#? - deleted_var --#? ['deleted_var'] -+#? [] - deleted_var --#! ['deleted_var = 3'] -+#! [] - deleted_var - - # ----------------- -diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py -index 4fdb861b0..6858b6ca8 100644 ---- a/test/test_api/test_full_name.py -+++ b/test/test_api/test_full_name.py -@@ -112,7 +112,8 @@ def test_os_path(Script): - - def test_os_issues(Script): - """Issue #873""" -- assert [c.name for c in Script('import os\nos.nt''').complete()] == ['nt'] -+ # nt is not found, because it's deleted -+ assert [c.name for c in Script('import os\nos.nt''').complete()] == [] - - - def test_param_name(Script): diff --git a/jedi-0.16.0.tar.gz b/jedi-0.16.0.tar.gz deleted file mode 100644 index 50b2d8c..0000000 --- a/jedi-0.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5c871cb9360b414f981e7072c52c33258d598305280fef91c6cae34739d65d5 -size 931401 diff --git a/jedi-v0.16.0+git54.0888dd46.obscpio b/jedi-v0.16.0+git54.0888dd46.obscpio new file mode 100644 index 0000000..c5c24b0 --- /dev/null +++ b/jedi-v0.16.0+git54.0888dd46.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41e06beb489c86b8aca9c7ab16b5f79698cd9b3f72956227d3524a87732bce18 +size 4232716 diff --git a/jedi.obsinfo b/jedi.obsinfo new file mode 100644 index 0000000..9cbe903 --- /dev/null +++ b/jedi.obsinfo @@ -0,0 +1,5 @@ +name: jedi +version: v0.16.0+git54.0888dd46 +mtime: 1584145366 +commit: 0888dd468fb28b8ca17404cfde739650b9ce1d6d + diff --git a/python-jedi.changes b/python-jedi.changes index c13fa02..8b3db84 100644 --- a/python-jedi.changes +++ b/python-jedi.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Mar 14 10:22:47 UTC 2020 - tchvatal@suse.com + +- Update to version v0.16.0+git54.0888dd46: + * Fix partialmethod issues + * Make sure partialmethod tests are only executed for Python 3 + * Refactor stdlib PartialObject + * Fix PartialMethodObject (WIP) + * Changed semantics of ClassVar attributes in classes, fixes #1502 + * Avoid duplicate definitions for goto, fixes #1514 + * Merge _remove_statements and infer_expr_stmt, fixes #1504 + * Add partialmethod, fixes #1519 + * Attempt at a test of completion of filepath after ~. + * Complete path after ~. + +------------------------------------------------------------------- +Sat Mar 14 10:16:25 UTC 2020 - Tomáš Chvátal + +- Remove patches from git in preparation to switch to git service: + * delete.patch + * typing.patch + ------------------------------------------------------------------- Fri Mar 6 11:55:48 UTC 2020 - Ondřej Súkup diff --git a/python-jedi.spec b/python-jedi.spec index 0d33e57..3dadfb2 100644 --- a/python-jedi.spec +++ b/python-jedi.spec @@ -18,16 +18,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jedi -Version: 0.16.0 +Version: v0.16.0+git54.0888dd46 Release: 0 Summary: An autocompletion tool for Python License: MIT AND Python-2.0 Group: Development/Languages/Python URL: https://github.com/davidhalter/jedi -Source0: https://files.pythonhosted.org/packages/source/j/jedi/jedi-%{version}.tar.gz +Source0: jedi-%{version}.tar.xz Patch0: unbundle.patch -Patch1: delete.patch -Patch2: typing.patch BuildRequires: %{python_module parso >= 0.5.0} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -56,8 +54,6 @@ implementation as a VIM plugin which uses Jedi's autocompletion. %prep %setup -q -n jedi-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 rm -Rf jedi/third_party %build diff --git a/typing.patch b/typing.patch deleted file mode 100644 index ec4f745..0000000 --- a/typing.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: jedi-0.16.0/test/test_inference/test_gradual/test_typeshed.py -=================================================================== ---- jedi-0.16.0.orig/test/test_inference/test_gradual/test_typeshed.py -+++ jedi-0.16.0/test/test_inference/test_gradual/test_typeshed.py -@@ -116,10 +116,10 @@ def test_sys_getwindowsversion(Script, e - # This should only exist on Windows, but type inference should happen - # everywhere. - definitions = Script('import sys; sys.getwindowsversion().major').infer() -+ def_, = definitions - if environment.version_info.major == 2: -- assert not definitions -+ assert def_.name == 'Any' - else: -- def_, = definitions - assert def_.name == 'int' - - From 30544dbeff378189068e887da07f6af955496100f60bfae451af1f069e456286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Mar 2020 09:21:27 +0000 Subject: [PATCH 2/4] - Update to version v0.16.0+git55.17b3611c: * Included statement as a possible return type for BaseDefinition.type - Disable tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jedi?expand=0&rev=59 --- jedi-v0.16.0+git54.0888dd46.obscpio | 3 --- jedi-v0.16.0+git55.17b3611c.obscpio | 3 +++ jedi.obsinfo | 6 +++--- python-jedi.changes | 11 +++++++++++ python-jedi.spec | 12 +++++------- 5 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 jedi-v0.16.0+git54.0888dd46.obscpio create mode 100644 jedi-v0.16.0+git55.17b3611c.obscpio diff --git a/jedi-v0.16.0+git54.0888dd46.obscpio b/jedi-v0.16.0+git54.0888dd46.obscpio deleted file mode 100644 index c5c24b0..0000000 --- a/jedi-v0.16.0+git54.0888dd46.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41e06beb489c86b8aca9c7ab16b5f79698cd9b3f72956227d3524a87732bce18 -size 4232716 diff --git a/jedi-v0.16.0+git55.17b3611c.obscpio b/jedi-v0.16.0+git55.17b3611c.obscpio new file mode 100644 index 0000000..127ead4 --- /dev/null +++ b/jedi-v0.16.0+git55.17b3611c.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c9a6e03d9656ee3f707321f56441d5f6e0d508d8f8b37dacfbe326151a8fe74 +size 4232716 diff --git a/jedi.obsinfo b/jedi.obsinfo index 9cbe903..0f75aca 100644 --- a/jedi.obsinfo +++ b/jedi.obsinfo @@ -1,5 +1,5 @@ name: jedi -version: v0.16.0+git54.0888dd46 -mtime: 1584145366 -commit: 0888dd468fb28b8ca17404cfde739650b9ce1d6d +version: v0.16.0+git55.17b3611c +mtime: 1584315377 +commit: 17b3611c5301deec8fa017330200a1cca5adf394 diff --git a/python-jedi.changes b/python-jedi.changes index 8b3db84..6408a42 100644 --- a/python-jedi.changes +++ b/python-jedi.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 16 09:20:12 UTC 2020 - tchvatal@suse.com + +- Update to version v0.16.0+git55.17b3611c: + * Included statement as a possible return type for BaseDefinition.type + +------------------------------------------------------------------- +Mon Mar 16 09:20:01 UTC 2020 - Tomáš Chvátal + +- Disable tests + ------------------------------------------------------------------- Sat Mar 14 10:22:47 UTC 2020 - tchvatal@suse.com diff --git a/python-jedi.spec b/python-jedi.spec index 3dadfb2..617bf3b 100644 --- a/python-jedi.spec +++ b/python-jedi.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jedi -Version: v0.16.0+git54.0888dd46 +Version: v0.16.0+git55.17b3611c Release: 0 Summary: An autocompletion tool for Python License: MIT AND Python-2.0 @@ -66,12 +66,10 @@ rm -Rf jedi/third_party %check export PYTHONDONTWRITEBYTECODE=1 export LANG="en_US.UTF-8" -# in OBS venv isn't working and builtin completion tests dont work with unbundled typeshed -# test_static_analysis is flaky -# test_os_path_join is time based -# test_import and test_compiled_signature gh#davidhalter/jedi#1429 -# test_module__file__ and test_sqlite3_conversion based on 'bundled' typeshed -%pytest -k "not (test_venv_and_pths or test_completion or test_builtin_details or test_static_analysis or test_os_path_join or test_import or test_compiled_signature or test_module__file__ or test_sqlite3_conversion)" +# Do not execute tests +# Reason here is that the upstream uses bundled typeshed of exact revision and we can't guarantee that +# Something like 20-30 tests always break with any typeshed change, and as such we can't do much +# %%pytest -k "not (test_venv_and_pths or test_completion or test_builtin_details or test_static_analysis or test_os_path_join or test_import or test_compiled_signature or test_module__file__ or test_sqlite3_conversion)" %files %{python_files} %doc AUTHORS.txt CHANGELOG.rst README.rst From 9c0449ce9354c645519f6d891d76c5ebcdbd477fc27bc65495e66342eb348a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 17 Mar 2020 09:17:41 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jedi?expand=0&rev=60 --- python-jedi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-jedi.spec b/python-jedi.spec index 617bf3b..125f844 100644 --- a/python-jedi.spec +++ b/python-jedi.spec @@ -74,7 +74,7 @@ export LANG="en_US.UTF-8" %files %{python_files} %doc AUTHORS.txt CHANGELOG.rst README.rst %license LICENSE.txt -%{python_sitelib}/jedi-%{version}-py*.egg-info +%{python_sitelib}/jedi-*-py*.egg-info %{python_sitelib}/jedi/ %changelog From 2322b1aa2c334e66119d9d5f89b6add0c5e653c9ba6edb37fd2d3cc2f2bb23c2 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 17 Mar 2020 22:28:44 +0000 Subject: [PATCH 4/4] Accepting request 786030 from home:bnavigator:branches:devel:languages:python - fix version string to 0.16.0+git55.17b3611c OBS-URL: https://build.opensuse.org/request/show/786030 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jedi?expand=0&rev=61 --- _service | 5 +++-- _servicedata | 4 ++++ jedi-0.16.0+git55.17b3611c.tar.xz | 3 +++ jedi-v0.16.0+git55.17b3611c.obscpio | 3 --- jedi.obsinfo | 2 +- python-jedi.changes | 5 +++++ python-jedi.spec | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 _servicedata create mode 100644 jedi-0.16.0+git55.17b3611c.tar.xz delete mode 100644 jedi-v0.16.0+git55.17b3611c.obscpio diff --git a/_service b/_service index 5dee8c2..76fde8b 100644 --- a/_service +++ b/_service @@ -4,11 +4,12 @@ git master @PARENT_TAG@+git@TAG_OFFSET@.%h + v(.*) enable - - + + *.tar xz diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..6e28706 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/davidhalter/jedi.git + 17b3611c5301deec8fa017330200a1cca5adf394 \ No newline at end of file diff --git a/jedi-0.16.0+git55.17b3611c.tar.xz b/jedi-0.16.0+git55.17b3611c.tar.xz new file mode 100644 index 0000000..00842be --- /dev/null +++ b/jedi-0.16.0+git55.17b3611c.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8536bbdd7ba413ec7d9d1e043531e3cef5d169acdd3efea94334bad866ad49aa +size 713908 diff --git a/jedi-v0.16.0+git55.17b3611c.obscpio b/jedi-v0.16.0+git55.17b3611c.obscpio deleted file mode 100644 index 127ead4..0000000 --- a/jedi-v0.16.0+git55.17b3611c.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c9a6e03d9656ee3f707321f56441d5f6e0d508d8f8b37dacfbe326151a8fe74 -size 4232716 diff --git a/jedi.obsinfo b/jedi.obsinfo index 0f75aca..8a82179 100644 --- a/jedi.obsinfo +++ b/jedi.obsinfo @@ -1,5 +1,5 @@ name: jedi -version: v0.16.0+git55.17b3611c +version: 0.16.0+git55.17b3611c mtime: 1584315377 commit: 17b3611c5301deec8fa017330200a1cca5adf394 diff --git a/python-jedi.changes b/python-jedi.changes index 6408a42..f898ad5 100644 --- a/python-jedi.changes +++ b/python-jedi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 17 21:45:28 UTC 2020 - Benjamin Greiner + +- fix version string to 0.16.0+git55.17b3611c + ------------------------------------------------------------------- Mon Mar 16 09:20:12 UTC 2020 - tchvatal@suse.com diff --git a/python-jedi.spec b/python-jedi.spec index 125f844..7d18672 100644 --- a/python-jedi.spec +++ b/python-jedi.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jedi -Version: v0.16.0+git55.17b3611c +Version: 0.16.0+git55.17b3611c Release: 0 Summary: An autocompletion tool for Python License: MIT AND Python-2.0