mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-12 15:02:55 +01:00
gnu: python-jedi: Update to 0.16.
* gnu/packages/patches/python-jedi-deleted-variables.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-jedi): Update to 0.16. [source](patches): New field.
This commit is contained in:
parent
ab6e4ab8c3
commit
745041b59f
3 changed files with 42 additions and 9 deletions
|
@ -1330,6 +1330,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
|
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
|
||||||
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
|
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
|
||||||
%D%/packages/patches/python-flint-includes.patch \
|
%D%/packages/patches/python-flint-includes.patch \
|
||||||
|
%D%/packages/patches/python-jedi-deleted-variables.patch \
|
||||||
%D%/packages/patches/python-libxml2-utf8.patch \
|
%D%/packages/patches/python-libxml2-utf8.patch \
|
||||||
%D%/packages/patches/python-mox3-python3.6-compat.patch \
|
%D%/packages/patches/python-mox3-python3.6-compat.patch \
|
||||||
%D%/packages/patches/python-testtools.patch \
|
%D%/packages/patches/python-testtools.patch \
|
||||||
|
|
38
gnu/packages/patches/python-jedi-deleted-variables.patch
Normal file
38
gnu/packages/patches/python-jedi-deleted-variables.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
Fix test failure in some environments, including Guix.
|
||||||
|
|
||||||
|
Taken from upstream:
|
||||||
|
https://github.com/davidhalter/jedi/commit/bec87f7ff82b0731713c6520a14c213341b4cecf
|
||||||
|
|
||||||
|
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):
|
|
@ -11217,25 +11217,19 @@ characters, mouse support, and auto suggestions.")
|
||||||
(define-public python-jedi
|
(define-public python-jedi
|
||||||
(package
|
(package
|
||||||
(name "python-jedi")
|
(name "python-jedi")
|
||||||
(version "0.15.1")
|
(version "0.16.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (pypi-uri "jedi" version))
|
(uri (pypi-uri "jedi" version))
|
||||||
|
(patches (search-patches "python-jedi-deleted-variables.patch"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds"))))
|
"1mb5kmrk9bkc3kwzx02j62cdan1jqd92q1z7h7wi9d30jg5p3j6m"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'disable-file-completion-test
|
|
||||||
;; A single parameterized test currently fail (see:
|
|
||||||
;; https://github.com/davidhalter/jedi/issues/1395). Remove it.
|
|
||||||
(lambda _
|
|
||||||
(substitute* "test/test_api/test_completion.py"
|
|
||||||
((".*'example.py', 'rb\"' \\+ join\\('\\.\\.'.*") ""))
|
|
||||||
#t))
|
|
||||||
(replace 'check
|
(replace 'check
|
||||||
(lambda _
|
(lambda _
|
||||||
(setenv "HOME" "/tmp")
|
(setenv "HOME" "/tmp")
|
||||||
|
|
Loading…
Add table
Reference in a new issue