[bug#52160] [PATCH 1/7] gnu: python-parso: Update to 0.8.2.

[bug#52160] [PATCH 1/7] gnu: python-parso: Update to 0.8.2.

[jgart via Guix-patches via]

Hi Guixers,

Here is a patch set for updating the unmaintained python language server 
that's in guix to use the new fork by the Spyder IDE team and community.

all best,

jgart

* gnu/packages/python-xyz.scm (python-parso): Update to 0.8.2.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ffd39860d8..de43be43b2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21320,13 +21320,13 @@ (define-public python-onetimepass
 (define-public python-parso
   (package
     (name "python-parso")
-    (version "0.7.1")
+    (version "0.8.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "parso" version))
        (sha256
-        (base32 "1f9fc99mjx0h2ad4mgsid728nnmw58hvnq3411g8ljlr9dr49fna"))))
+        (base32 "161k8771m7w60qakyvrwf9q62lvakmix7mpfylpy7713qs939f0j"))))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (build-system python-build-system)
-- 
2.34.0

[bug#52160] [PATCH 2/7] gnu: python2-jedi: Remove package.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python2-jedi): Delete variable.
---
 gnu/packages/python-xyz.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index de43be43b2..5b5ab2eaae 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16282,9 +16282,6 @@ (define-public python-jedi
 well.")
     (license license:expat)))
 
-(define-public python2-jedi
-  (package-with-python2 python-jedi))
-
 (define-public ptpython
   (package
     (name "ptpython")
-- 
2.34.0

[bug#52160] [PATCH 3/7] gnu: python-jedi: Update to 0.18.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jedi): Update to 0.18.1.
[native-inputs]: Add python-django-2-2 and python-colorama.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5b5ab2eaae..203af5865e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -141,6 +141,7 @@ (define-module (gnu packages python-xyz)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages django)
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages djvu)
   #:use-module (gnu packages docker)
@@ -16249,13 +16250,13 @@ (define-public python2-prompt-toolkit-1
 (define-public python-jedi
   (package
     (name "python-jedi")
-    (version "0.17.2")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "jedi" version))
        (sha256
-        (base32 "080xyf97ifabdz7jp8clg00b8zv5g33fva1fb2xf80q6fndpvvc6"))))
+        (base32 "1as9v6kv49j11al2mzjh72dd5mxxnfcjv0z5dbmwi6aalqk7c4vl"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -16267,7 +16268,9 @@ (define-public python-jedi
                (invoke "python" "-m" "pytest" "-vv"))
              #t)))))
     (native-inputs
-     `(("python-pytest" ,python-pytest)
+     `(("python-colorama" ,python-colorama)
+       ("python-django" ,python-django-2.2)
+       ("python-pytest" ,python-pytest)
        ("python-docopt" ,python-docopt)))
     (propagated-inputs
      `(("python-parso" ,python-parso)))
-- 
2.34.0

[bug#52161] [PATCH 4/7] gnu: Add python-lsp-jsonrpc.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jsonrpc-server): Delete variable.
* gnu/packages/python-xyz.scm (python-lsp-jsonrpc): New variable.

Removes deprecated python-jsonrpc-server package and adds maintained
fork.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 203af5865e..1383f9681d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4871,24 +4871,24 @@ (define-public python-feedgenerator
 (define-public python2-feedgenerator
   (package-with-python2 python-feedgenerator))
 
-(define-public python-jsonrpc-server
+(define-public python-lsp-jsonrpc
   (package
-    (name "python-jsonrpc-server")
-    (version "0.4.0")
+    (name "python-lsp-jsonrpc")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "python-jsonrpc-server" version))
+       (uri (pypi-uri "python-lsp-jsonrpc" version))
        (sha256
         (base32
-         "1585ybn3djvx5r5zbxkzlhz2wb1d47y4wrfwaxdyq0gi87jl7ib2"))))
+         "1gb0fsamxndhplx25v8m0b3k7aknzy454fpa0qsqsqnv6c3igv3v"))))
     (build-system python-build-system)
-    (propagated-inputs
+    (native-inputs
      `(("python-mock" ,python-mock)
-       ("python-pytest" ,python-pytest)
-       ("python-ujson" ,python-ujson)))
-    (home-page
-     "https://github.com/palantir/python-jsonrpc-server")
+       ("python-pytest" ,python-pytest)))
+    (propagated-inputs
+     `(("python-ujson" ,python-ujson)))
+    (home-page "https://github.com/python-lsp/python-lsp-jsonrpc")
     (synopsis "JSON RPC 2.0 server library")
     (description
      "This package provides a JSON RPC 2.0 server library for Python.")
-- 
2.34.0

[bug#52160] [PATCH 5/7] gnu: python-lsp-jsonrpc: Add deprecated alias.

[jgart via Guix-patches via]

Add deprecated alias for package removed in the parent commit.
* gnu/packages/python-xyz.scm (python-jsonrpc-server): New variable.
---
 gnu/packages/python-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1383f9681d..942dae04f3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4894,6 +4894,9 @@ (define-public python-lsp-jsonrpc
      "This package provides a JSON RPC 2.0 server library for Python.")
     (license license:expat)))
 
+(define-public python-jsonrpc-server
+  (deprecated-package "python-jsonrpc-server" python-lsp-jsonrpc))
+
 (define-public python-pydantic
   (package
     (name "python-pydantic")
-- 
2.34.0

[bug#52160] [PATCH 6/7] gnu: Add python-lsp-server.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-language-server): Delete variable.
* gnu/packages/python-xyz.scm (python-lsp-server): New variable.

Removes deprecated python-language-server package and adds maintained
fork.
---
 gnu/packages/python-xyz.scm | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 942dae04f3..4a0b811ed6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4972,29 +4972,23 @@ (define-public python-pydocstyle
 Server (PLS).")
     (license license:expat)))
 
-(define-public python-language-server
+(define-public python-lsp-server
   (package
-    (name "python-language-server")
-    (version "0.36.2")
+    (name "python-lsp-server")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "python-language-server" version))
+       (uri (pypi-uri "python-lsp-server" version))
        (sha256
         (base32
-         "1c0pnk2aibfhfaanrs0a5gkabkvz81gj20z7r0152b7fcx5ci14r"))))
+         "15075a5irjxh55wcdf25hllz9c42byxc4770cmwgb480k1dm8scq"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'relax-deps
-           (lambda _
-             (substitute* "setup.py" (("pycodestyle>=2.6.0,<2.7.0")
-                                      "pycodestyle"))
-             (substitute* "setup.py" (("pyflakes>=2.2.0,<2.3.0") "pyflakes"))
-             #t))
          (add-before 'check 'set-HOME
-           (lambda _ (setenv "HOME" "/tmp") #t))
+           (lambda _ (setenv "HOME" "/tmp")))
          (replace 'check
            (lambda _
              ;; Disable failing test.
@@ -5007,7 +5001,7 @@ (define-public python-language-server
        ("python-flake8" ,python-flake8)
        ("python-future" ,python-future)
        ("python-jedi" ,python-jedi)
-       ("python-jsonrpc-server" ,python-jsonrpc-server)
+       ("python-lsp-jsonrpc" ,python-lsp-jsonrpc)
        ("python-pluggy" ,python-pluggy)
        ("python-pycodestyle" ,python-pycodestyle)
        ("python-pyflakes" ,python-pyflakes)
@@ -5028,10 +5022,10 @@ (define-public python-language-server
     (home-page "https://github.com/palantir/python-language-server")
     (synopsis "Python implementation of the Language Server Protocol")
     (description
-     "The Python Language Server (pyls) is an implementation of the Python 3
-language specification for the Language Server Protocol (LSP).  This tool is
-used in text editing environments to provide a complete and integrated
-feature-set for programming Python effectively.")
+"The Python Language Server @command{pylsp} is an implementation of the
+Python 3 language specification for the Language Server Protocol (LSP).
+This tool is used in text editing environments to provide a complete
+and integrated feature-set for programming Python effectively.")
     (license license:expat)))
 
 (define-public python-pathspec
-- 
2.34.0

[bug#52160] [PATCH 7/7] gnu: python-language-server: Add deprecated alias.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-language-server): New variable.

Add deprecated alias for package removed in the parent commit.
---
 gnu/packages/python-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4a0b811ed6..b7fff3cd89 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5028,6 +5028,9 @@ (define-public python-lsp-server
 and integrated feature-set for programming Python effectively.")
     (license license:expat)))
 
+(define-public python-language-server
+  (deprecated-package "python-language-server" python-lsp-server))
+
 (define-public python-pathspec
   (package
     (name "python-pathspec")
-- 
2.34.0

[bug#52160] [PATCH 1/7] gnu: python-parso: Update to 0.8.2.

[Nicolas Goaziou]

Hello,

jgart via Guix-patches via <guix-patches@gnu.org> writes:

> Here is a patch set for updating the unmaintained python language server 
> that's in guix to use the new fork by the Spyder IDE team and
> community.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou

[bug#52160] [PATCH 1/7] gnu: python-parso: Update to 0.8.2.

[jgart via Guix-patches via]

On Wed, 01 Dec 2021 17:15:55 +0100 Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
> Hello,
> 
> jgart via Guix-patches via <guix-patches@gnu.org> writes:
> 
> > Here is a patch set for updating the unmaintained python language server 
> > that's in guix to use the new fork by the Spyder IDE team and
> > community.
> 
> Applied. Thank you.

Thank you Nicolas! 

all best,

jgart