diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-jedi-sort-project-test.patch | 18 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 14 |
3 files changed, 2 insertions, 31 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ef6533bd8d..e574697f32 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1454,7 +1454,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ - %D%/packages/patches/python-jedi-sort-project-test.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/patches/python-jedi-sort-project-test.patch b/gnu/packages/patches/python-jedi-sort-project-test.patch deleted file mode 100644 index b2d602dfe6..0000000000 --- a/gnu/packages/patches/python-jedi-sort-project-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -Sort the result of file system traversal to avoid test failure on different -file systems. - -Taken from upstream: -https://github.com/davidhalter/jedi/commit/7ff76bb7d0d94514e17cd1647f4ffaf533dd55f5 - -diff --git a/test/test_api/test_project.py b/test/test_api/test_project.py ---- 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( diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42bb160a75..3aebff078b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12607,27 +12607,17 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.17.0") + (version "0.17.2") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) - (patches (search-patches "python-jedi-sort-project-test.patch")) (sha256 - (base32 - "0c1h9x3a9klvk2g288wl328x8xgzw7136k6vs9hkd56b85vcjh6z")))) + (base32 "080xyf97ifabdz7jp8clg00b8zv5g33fva1fb2xf80q6fndpvvc6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'adjust-test-for-python-3.8 - (lambda _ - ;; Mimic upstream commit e7feeef64 to allow for extra output lines - ;; in TestSetupReadline on Python 3.8. Remove for jedi > 0.17.0. - (substitute* "test/test_utils.py" - (("assert len\\(difference\\) < 20") - "assert len(difference) < 22")) - #t)) (replace 'check (lambda _ (setenv "HOME" "/tmp") |