Merge pull request #301477 from r-ryantm/auto-update/python311Packages.python-lsp-server

python311Packages.python-lsp-server: 1.10.1 -> 1.11.0

pkgs/development/python-modules/python-lsp-server/default.nix

@@ -1,56 +1,56 @@
-{ lib
-, stdenv
-, autopep8
-, buildPythonPackage
-, docstring-to-markdown
-, fetchFromGitHub
-, flake8
-, flaky
-, importlib-metadata
-, jedi
-, matplotlib
-, mccabe
-, numpy
-, pandas
-, pluggy
-, pycodestyle
-, pydocstyle
-, pyflakes
-, pylint
-, pyqt5
-, pytestCheckHook
-, python-lsp-jsonrpc
-, pythonOlder
-, pythonRelaxDepsHook
-, rope
-, setuptools
-, setuptools-scm
-, toml
-, ujson
-, websockets
-, whatthepatch
-, wheel
-, yapf
+{
+  lib,
+  stdenv,
+  autopep8,
+  buildPythonPackage,
+  docstring-to-markdown,
+  fetchFromGitHub,
+  flake8,
+  flaky,
+  importlib-metadata,
+  jedi,
+  matplotlib,
+  mccabe,
+  numpy,
+  pandas,
+  pluggy,
+  pycodestyle,
+  pydocstyle,
+  pyflakes,
+  pylint,
+  pyqt5,
+  pytestCheckHook,
+  python-lsp-jsonrpc,
+  pythonOlder,
+  pythonRelaxDepsHook,
+  rope,
+  setuptools,
+  setuptools-scm,
+  toml,
+  ujson,
+  websockets,
+  whatthepatch,
+  yapf,
 }:
 
 buildPythonPackage rec {
   pname = "python-lsp-server";
-  version = "1.10.1";
+  version = "1.11.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-lsp";
-    repo = pname;
+    repo = "python-lsp-server";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tY+BE8DAajZKwlZ2D7uCr9LC7D61ULkhV8Z9EpRu6j0=";
+    hash = "sha256-0DFcnGlyDOK0Lxpr++xV6klhFF9b1fihH5FY/tblr+E=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
-      --replace "--cov pylsp --cov test" ""
+      --replace-fail "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
+      --replace-fail "--cov pylsp --cov test" ""
   '';
 
   pythonRelaxDeps = [
@@ -62,22 +62,18 @@ buildPythonPackage rec {
     "pyflakes"
   ];
 
-  nativeBuildInputs = [
-    pythonRelaxDepsHook
-    setuptools-scm
-    wheel
-  ];
+  nativeBuildInputs = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
     docstring-to-markdown
     jedi
     pluggy
     python-lsp-jsonrpc
     setuptools # `pkg_resources`imported in pylsp/config/config.py
     ujson
-  ] ++ lib.optionals (pythonOlder "3.10") [
-    importlib-metadata
-  ];
+  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   passthru.optional-dependencies = {
     all = [
@@ -93,62 +89,46 @@ buildPythonPackage rec {
       whatthepatch
       yapf
     ];
-    autopep8 = [
-      autopep8
-    ];
-    flake8 = [
-      flake8
-    ];
-    mccabe = [
-      mccabe
-    ];
-    pycodestyle = [
-      pycodestyle
-    ];
-    pydocstyle = [
-      pydocstyle
-    ];
-    pyflakes = [
-      pyflakes
-    ];
-    pylint = [
-      pylint
-    ];
-    rope = [
-      rope
-    ];
+    autopep8 = [ autopep8 ];
+    flake8 = [ flake8 ];
+    mccabe = [ mccabe ];
+    pycodestyle = [ pycodestyle ];
+    pydocstyle = [ pydocstyle ];
+    pyflakes = [ pyflakes ];
+    pylint = [ pylint ];
+    rope = [ rope ];
     yapf = [
       whatthepatch
       yapf
     ];
-    websockets = [
-      websockets
-    ];
+    websockets = [ websockets ];
   };
 
-  nativeCheckInputs = [
-    flaky
-    matplotlib
-    numpy
-    pandas
-    pytestCheckHook
-  ] ++ passthru.optional-dependencies.all
-  # pyqt5 is broken on aarch64-darwin
-  ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [
-    pyqt5
-  ];
-
-  disabledTests = [
-    # Don't run lint tests
-    "test_pydocstyle"
-    # https://github.com/python-lsp/python-lsp-server/issues/243
-    "test_numpy_completions"
-    "test_workspace_loads_pycodestyle_config"
-    "test_autoimport_code_actions_and_completions_for_notebook_document"
-  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+  nativeCheckInputs =
+    [
+      flaky
+      matplotlib
+      numpy
+      pandas
+      pytestCheckHook
+    ]
+    ++ passthru.optional-dependencies.all
     # pyqt5 is broken on aarch64-darwin
-    "test_pyqt_completion"
-  ];
+    ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ];
+
+  disabledTests =
+    [
+      # Don't run lint tests
+      "test_pydocstyle"
+      # https://github.com/python-lsp/python-lsp-server/issues/243
+      "test_numpy_completions"
+      "test_workspace_loads_pycodestyle_config"
+      "test_autoimport_code_actions_and_completions_for_notebook_document"
+    ]
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+      # pyqt5 is broken on aarch64-darwin
+      "test_pyqt_completion"
+    ];
 
   preCheck = ''
     export HOME=$(mktemp -d);