[bug#57056] [PATCH] Update python-lsp-server

[bug#57056] [PATCH] Update python-lsp-server

[Nicolas Graves via Guix-patches via]

Hi!

This patch series updates the python-lsp-server.
The package python-pluggy has been updated and the rebuild of
python-pytest works fine.

-- 
Best regards,
Nicolas Graves

[bug#57056] [PATCH 1/3] gnu: Add python-whatthepatch.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-whatthepatch): New variable.
---
 gnu/packages/python-web.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 7c5e5651c8..24ab022777 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7666,3 +7666,20 @@ (define-public python-sendgrid
 SendGrid Web API v3.  Version 3+ of the library provides full support for all
 SendGrid Web API v3 endpoints, including the new v3 /mail/send.")
     (license license:expat)))
+
+(define-public python-whatthepatch
+  (package
+    (name "python-whatthepatch")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "whatthepatch" version))
+              (sha256
+               (base32
+                "17zspm5sxhvggkdhwq4s0fzf4mkc825xshn734g2j2iy2xcylh65"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/cscorley/whatthepatch")
+    (synopsis "Patch parsing and application")
+    (description
+     "This package provides a library to parse and apply patches.")
+    (license license:expat)))
-- 
2.37.1

[bug#57056] [PATCH 2/3] gnu: python-pluggy: Update to 1.0.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pluggy): Update to 1.0.0.
---
 gnu/packages/python-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b6ca32a757..9736930f15 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14447,17 +14447,17 @@ (define-public python-rsa
 (define-public python-pluggy
   (package
    (name "python-pluggy")
-   (version "0.13.1")
+   (version "1.0.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "pluggy" version))
      (sha256
       (base32
-       "1c35qyhvy27q9ih9n899f3h4sdnpgq027dbiilly2qb5cvgarchm"))))
+       "0n8iadlas2z1b4h0fc73b043c7iwfvx9rgvqm1azjmffmhxkf922"))))
    (build-system python-build-system)
-   (native-inputs
-    (list python-setuptools-scm))
+   (propagated-inputs (list python-importlib-metadata))
+   (native-inputs (list python-setuptools-scm))
    (synopsis "Plugin and hook calling mechanism for Python")
    (description "Pluggy is an extraction of the plugin manager as used by
 Pytest but stripped of Pytest specific details.")
-- 
2.37.1

[bug#57056] [PATCH 3/3] gnu: python-lsp-server: Update to 1.5.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-lsp-server): Update to 1.5.0.
---
 gnu/packages/python-xyz.scm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9736930f15..a6f07d9252 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5258,49 +5258,38 @@ (define-public python-pydocstyle
 (define-public python-lsp-server
   (package
     (name "python-lsp-server")
-    (version "1.3.3")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-lsp-server" version))
        (sha256
         (base32
-         "0h6wxzmm6qjfwkkn3mnzn1fpmcp23fpbk74bi8p540q1nzccqj0v"))))
+         "039qi5x9sa1mjzinimxhiwzj8lxn5d5l33q6qhkjl0i5k70r9h75"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'set-HOME
-           (lambda _ (setenv "HOME" "/tmp")))
-         (replace 'check
-           (lambda _
-             ;; Disable failing test.
-             (invoke "python" "-m" "pytest" "-k"
-                     "not test_pyqt_completion"))))))
     (propagated-inputs
      (list python-autopep8
            python-pydocstyle
            python-flake8
-           python-future
            python-jedi
            python-lsp-jsonrpc
            python-pluggy
            python-pycodestyle
            python-pyflakes
            python-rope
+           python-setuptools
            python-ujson
            python-yapf))
     (native-inputs
      (list python-coverage
            python-flaky
            python-matplotlib
-           python-mock
            python-numpy
            python-pandas
            python-pylint
            python-pytest
            python-pytest-cov
-           python-versioneer))
+           python-whatthepatch))
     (home-page "https://github.com/python-lsp/python-lsp-server")
     (synopsis "Python implementation of the Language Server Protocol")
     (description
-- 
2.37.1

[bug#57056] [PATCH] Update python-lsp-server

[Mathieu Othacehe]

Hello Nicolas,

> +   (propagated-inputs (list python-importlib-metadata))

This needs to be described in the commit message, this way:

[propagated-inputs]: Add python-importlib-metadata.

Thanks,

Mathieu

[bug#57056] [PATCH] Update python-lsp-server

[Mathieu Othacehe]

Hello,

> -       (modify-phases %standard-phases
> -         (add-before 'check 'set-HOME
> -           (lambda _ (setenv "HOME" "/tmp")))

You need to document it in the commit message, this way:

[arguments]{set-HOME}: Remove this phase because...
{check}: Do not replace it as test_pyqt_completion is not longer
failing.

or something similar.
>      (propagated-inputs
>       (list python-autopep8
>             python-pydocstyle
>             python-flake8
> -           python-future
>             python-jedi
>             python-lsp-jsonrpc
>             python-pluggy
>             python-pycodestyle
>             python-pyflakes
>             python-rope
> +           python-setuptools
>             python-ujson
>             python-yapf))
>      (native-inputs
>       (list python-coverage
>             python-flaky
>             python-matplotlib
> -           python-mock
>             python-numpy
>             python-pandas
>             python-pylint
>             python-pytest
>             python-pytest-cov
> -           python-versioneer))
> +           python-whatthepatch))

Ditto, with something like

[propagated-inputs]: Remove python-future and add python-setuptools.
[native-inputs]: Remove python-mock, python-versioneer and add
python-whatthepatch.

Could you please send a v2?

Thanks,

Mathieu

[bug#57056] [PATCH v2 1/3] gnu: Add python-whatthepatch.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-whatthepatch): New variable.
---
 gnu/packages/python-web.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 896e60aba2..0f00a23747 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7761,3 +7761,20 @@ (define-public python-shopifyapi
 ruby Shopify API gem.  The library makes HTTP requests to Shopify in order to
 list, create, update, or delete resources (e.g. Order, Product, Collection).")
     (license license:expat)))
+
+(define-public python-whatthepatch
+  (package
+    (name "python-whatthepatch")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "whatthepatch" version))
+              (sha256
+               (base32
+                "17zspm5sxhvggkdhwq4s0fzf4mkc825xshn734g2j2iy2xcylh65"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/cscorley/whatthepatch")
+    (synopsis "Patch parsing and application")
+    (description
+     "This package provides a library to parse and apply patches.")
+    (license license:expat)))
-- 
2.37.1

[bug#57056] [PATCH v2 2/3] gnu: python-pluggy: Update to 1.0.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pluggy): Update to 1.0.0.
  [propagated-inputs]: Add python-importlib-metadata.
---
 gnu/packages/python-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9422bf2866..01b78a4e19 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14509,17 +14509,17 @@ (define-public python-rsa
 (define-public python-pluggy
   (package
    (name "python-pluggy")
-   (version "0.13.1")
+   (version "1.0.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "pluggy" version))
      (sha256
       (base32
-       "1c35qyhvy27q9ih9n899f3h4sdnpgq027dbiilly2qb5cvgarchm"))))
+       "0n8iadlas2z1b4h0fc73b043c7iwfvx9rgvqm1azjmffmhxkf922"))))
    (build-system python-build-system)
-   (native-inputs
-    (list python-setuptools-scm))
+   (propagated-inputs (list python-importlib-metadata))
+   (native-inputs (list python-setuptools-scm))
    (synopsis "Plugin and hook calling mechanism for Python")
    (description "Pluggy is an extraction of the plugin manager as used by
 Pytest but stripped of Pytest specific details.")
-- 
2.37.1

[bug#57056] [PATCH v2 3/3] gnu: python-lsp-server: Update to 1.5.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-lsp-server): Update to 1.5.0.
   [arguments]{set-HOME}: Remove this phase because tests do not require it
   anymore.
   {check}: Do not replace it as test_pyqt_completion is not longer failing.
   [propagated-inputs]: Remove python-future and add python-setuptools.
   [native-inputs]: Remove python-mock, python-versioneer and add
   python-whatthepatch.
---
 gnu/packages/python-xyz.scm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 01b78a4e19..ac2de03ff4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5273,49 +5273,38 @@ (define-public python-pydocstyle
 (define-public python-lsp-server
   (package
     (name "python-lsp-server")
-    (version "1.3.3")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-lsp-server" version))
        (sha256
         (base32
-         "0h6wxzmm6qjfwkkn3mnzn1fpmcp23fpbk74bi8p540q1nzccqj0v"))))
+         "039qi5x9sa1mjzinimxhiwzj8lxn5d5l33q6qhkjl0i5k70r9h75"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'set-HOME
-           (lambda _ (setenv "HOME" "/tmp")))
-         (replace 'check
-           (lambda _
-             ;; Disable failing test.
-             (invoke "python" "-m" "pytest" "-k"
-                     "not test_pyqt_completion"))))))
     (propagated-inputs
      (list python-autopep8
            python-pydocstyle
            python-flake8
-           python-future
            python-jedi
            python-lsp-jsonrpc
            python-pluggy
            python-pycodestyle
            python-pyflakes
            python-rope
+           python-setuptools
            python-ujson
            python-yapf))
     (native-inputs
      (list python-coverage
            python-flaky
            python-matplotlib
-           python-mock
            python-numpy
            python-pandas
            python-pylint
            python-pytest
            python-pytest-cov
-           python-versioneer))
+           python-whatthepatch))
     (home-page "https://github.com/python-lsp/python-lsp-server")
     (synopsis "Python implementation of the Language Server Protocol")
     (description
-- 
2.37.1

[bug#57056] [PATCH] Update python-lsp-server

[Mathieu Othacehe]

Hey,

> * gnu/packages/python-xyz.scm (python-lsp-server): Update to 1.5.0.
>    [arguments]{set-HOME}: Remove this phase because tests do not require it
>    anymore.
>    {check}: Do not replace it as test_pyqt_completion is not longer failing.
>    [propagated-inputs]: Remove python-future and add python-setuptools.
>    [native-inputs]: Remove python-mock, python-versioneer and add
>    python-whatthepatch.

Thanks for the v2! I noticed this lint warning, something we should
worry about:

gnu/packages/python-xyz.scm:5274:2: python-lsp-server@1.5.0: 'python-setuptools' should probably not be an input at all

Mathieu

[bug#57056] [PATCH v3 1/3] gnu: Add python-whatthepatch.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-whatthepatch): New variable.
---
 gnu/packages/python-web.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 896e60aba2..0f00a23747 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7761,3 +7761,20 @@ (define-public python-shopifyapi
 ruby Shopify API gem.  The library makes HTTP requests to Shopify in order to
 list, create, update, or delete resources (e.g. Order, Product, Collection).")
     (license license:expat)))
+
+(define-public python-whatthepatch
+  (package
+    (name "python-whatthepatch")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "whatthepatch" version))
+              (sha256
+               (base32
+                "17zspm5sxhvggkdhwq4s0fzf4mkc825xshn734g2j2iy2xcylh65"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/cscorley/whatthepatch")
+    (synopsis "Patch parsing and application")
+    (description
+     "This package provides a library to parse and apply patches.")
+    (license license:expat)))
-- 
2.37.1

[bug#57056] [PATCH v3 2/3] gnu: python-pluggy: Update to 1.0.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pluggy): Update to 1.0.0.
  [propagated-inputs]: Add python-importlib-metadata.
---
 gnu/packages/python-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 13ab2f2c8b..12a4aa168b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14511,17 +14511,17 @@ (define-public python-rsa
 (define-public python-pluggy
   (package
    (name "python-pluggy")
-   (version "0.13.1")
+   (version "1.0.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "pluggy" version))
      (sha256
       (base32
-       "1c35qyhvy27q9ih9n899f3h4sdnpgq027dbiilly2qb5cvgarchm"))))
+       "0n8iadlas2z1b4h0fc73b043c7iwfvx9rgvqm1azjmffmhxkf922"))))
    (build-system python-build-system)
-   (native-inputs
-    (list python-setuptools-scm))
+   (propagated-inputs (list python-importlib-metadata))
+   (native-inputs (list python-setuptools-scm))
    (synopsis "Plugin and hook calling mechanism for Python")
    (description "Pluggy is an extraction of the plugin manager as used by
 Pytest but stripped of Pytest specific details.")
-- 
2.37.1

[bug#57056] [PATCH v3 3/3] gnu: python-lsp-server: Update to 1.5.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-lsp-server): Update to 1.5.0.
   [arguments]{set-HOME}: Remove this phase because tests do not require it
   anymore.
   {check}: Do not replace it as test_pyqt_completion is not longer failing.
   [propagated-inputs]: Remove python-future.
   [native-inputs]: Remove python-mock, python-versioneer and add
   python-whatthepatch.
---
 gnu/packages/python-xyz.scm | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 12a4aa168b..48bc1173af 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5273,30 +5273,19 @@ (define-public python-pydocstyle
 (define-public python-lsp-server
   (package
     (name "python-lsp-server")
-    (version "1.3.3")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-lsp-server" version))
        (sha256
         (base32
-         "0h6wxzmm6qjfwkkn3mnzn1fpmcp23fpbk74bi8p540q1nzccqj0v"))))
+         "039qi5x9sa1mjzinimxhiwzj8lxn5d5l33q6qhkjl0i5k70r9h75"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'set-HOME
-           (lambda _ (setenv "HOME" "/tmp")))
-         (replace 'check
-           (lambda _
-             ;; Disable failing test.
-             (invoke "python" "-m" "pytest" "-k"
-                     "not test_pyqt_completion"))))))
     (propagated-inputs
      (list python-autopep8
            python-pydocstyle
            python-flake8
-           python-future
            python-jedi
            python-lsp-jsonrpc
            python-pluggy
@@ -5309,13 +5298,12 @@ (define-public python-lsp-server
      (list python-coverage
            python-flaky
            python-matplotlib
-           python-mock
            python-numpy
            python-pandas
            python-pylint
            python-pytest
            python-pytest-cov
-           python-versioneer))
+           python-whatthepatch))
     (home-page "https://github.com/python-lsp/python-lsp-server")
     (synopsis "Python implementation of the Language Server Protocol")
     (description
-- 
2.37.1

bug#57056: [PATCH] Update python-lsp-server

[Mathieu Othacehe]

Hey,

> * gnu/packages/python-xyz.scm (python-lsp-server): Update to 1.5.0.
>    [arguments]{set-HOME}: Remove this phase because tests do not require it
>    anymore.
>    {check}: Do not replace it as test_pyqt_completion is not longer failing.
>    [propagated-inputs]: Remove python-future.
>    [native-inputs]: Remove python-mock, python-versioneer and add
>    python-whatthepatch.

Added your copyright and pushed.

Thanks,

Mathieu

[bug#57056] [PATCH] Update python-lsp-server

[Mathieu Othacehe]

> * gnu/packages/python-xyz.scm (python-pluggy): Update to 1.0.0.
>   [propagated-inputs]: Add python-importlib-metadata.

Turns out this one was causing an infinite evaluation loop and I had to
revert it just before pushing.

Could it be because of the python-importlib-metadata inclusion?

Thanks,

Mathieu

[bug#57056] [PATCH] Update python-lsp-server

[Nicolas Graves via Guix-patches via]

> Could it be because of the python-importlib-metadata inclusion?

I would rather bet on the presence of pluggy in pytest inputs, and the
presence of pytest in the build system, or something like that.

I can't look at that today, but I will investigate that.

-- 
Best regards,
Nicolas Graves

[bug#57056] How can I reproduce?

[Nicolas Graves via Guix-patches via]

Hi Mathieu,

Just a small question because I'm not able to reproduce the inifinite
evaluation loop.

I've tried the following:
- guix source git repository + checkout 07f807f12c and added my
python-pluggy commit
- guix shell -D guix then ./bootstrap and then ./configure --localstatedir=/var
(this step is not very clear for beginners in the 20.2 Running Guix
Before It Is Installed info node, I had to ask on libera chat to get it
to work)
- guix build (either python-pluggy, python-pytest, python-lsp-server) -K

But everything seems to build fine (possibly because of grafting
from my store however).

-- 
Best regards,
Nicolas Graves