Merge branch 'develop' into develop

ccordoba12 · web-flow · commit 3f95bd0e082f · 2026-07-18T16:43:28.000-07:00
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -22,13 +22,13 @@ jobs:
       OS: 'linux'
     timeout-minutes: 2
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~/.cache/pip
           key: static-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: static-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.9'
           architecture: 'x64'
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -24,16 +24,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.11', '3.10', '3.9']
+        PYTHON_VERSION: ['3.14', '3.13', '3.12', '3.11', '3.10', '3.9']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'
diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -16,24 +16,24 @@ concurrency:
 jobs:
   build:
     name: Mac Py${{ matrix.PYTHON_VERSION }}
-    runs-on: macos-13
+    runs-on: macos-14
     env:
       CI: 'true'
       OS: 'macos'
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.11', '3.10', '3.9']
+        PYTHON_VERSION: ['3.14', '3.12', '3.11']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~/Library/Caches/pip
           key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'
diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -24,16 +24,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.11', '3.10', '3.9']
+        PYTHON_VERSION: ['3.14', '3.12', '3.9']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~\AppData\Local\pip\Cache
           key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'
diff --git a/.gitignore b/.gitignore
@@ -100,6 +100,7 @@ ENV/
 
 # Spyder project settings
 .spyderproject
+.spyproject
 
 # Rope project settings
 .ropeproject
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # History of changes
 
+## Version 1.14.0 (2025/12/06)
+
+### New features
+* Add `pylsp.signature.include_docstring` to hide docstring in signatures.
+* Add support for Pylint 4.
+* Fix support for Python 3.14.
+
+### Pull Requests Merged
+
+* [PR 690](https://github.com/python-lsp/python-lsp-server/pull/690) - Fix starting the server for Python 3.14 and run tests with that version, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 689](https://github.com/python-lsp/python-lsp-server/pull/689) - Adjust test based on Jedi version, by [@aeliton](https://github.com/aeliton)
+* [PR 687](https://github.com/python-lsp/python-lsp-server/pull/687) - Bump allowed pylint to less than 4.1, by [@tiltingpenguin](https://github.com/tiltingpenguin)
+* [PR 686](https://github.com/python-lsp/python-lsp-server/pull/686) - Add option to hide docstring in signatures, by [@tomekwojcik](https://github.com/tomekwojcik)
+
+In this release 4 pull requests were closed.
+
+----
+
+## Version 1.13.2 (2025/11/19)
+
+### Pull Requests Merged
+
+* [PR 683](https://github.com/python-lsp/python-lsp-server/pull/683) - Prevent showing cmd on Windows when running flake8, by [@dalthviz](https://github.com/dalthviz)
+* [PR 669](https://github.com/python-lsp/python-lsp-server/pull/669) - Fix license entries in `pyproject.toml` due to pep 639, by [@ccordoba12](https://github.com/ccordoba12)
+
+In this release 2 pull requests were closed.
+
+----
+
 ## Version 1.13.1 (2025/08/26)
 
 ### Pull Requests Merged
diff --git a/CONFIGURATION.md b/CONFIGURATION.md
@@ -77,6 +77,7 @@ This server can be configured using the `workspace/didChangeConfiguration` metho
 | `pylsp.rope.extensionModules` | `string` | Builtin and c-extension modules that are allowed to be imported and inspected by rope. | `null` |
 | `pylsp.rope.ropeFolder` | `array` of unique `string` items | The name of the folder in which rope stores project configurations and data.  Pass `null` for not using such a folder at all. | `null` |
 | `pylsp.signature.formatter` | `string` (one of: `'black'`, `'ruff'`, `None`) | Formatter to use for reformatting signatures in docstrings. | `"black"` |
-| `pylsp.signature.line_length` | `number`  | Maximum line length in signatures. | `88` |
+| `pylsp.signature.include_docstring` | `boolean` | Include signature docstring. | `true` |
+| `pylsp.signature.line_length` | `integer` | Maximum line length in signatures. | `88` |
 
 This documentation was generated from `pylsp/config/schema.json`. Please do not edit this file directly.
diff --git a/pylsp/_utils.py b/pylsp/_utils.py
@@ -96,7 +96,13 @@ def find_parents(root, path, names):
     # Split the relative by directory, generate all the parent directories, then check each of them.
     # This avoids running a loop that has different base-cases for unix/windows
     # e.g. /a/b and /a/b/c/d/e.py -> ['/a/b', 'c', 'd']
-    dirs = [root] + os.path.relpath(os.path.dirname(path), root).split(os.path.sep)
+    try:
+        dirs = [root] + os.path.relpath(os.path.dirname(path), root).split(os.path.sep)
+    except ValueError:
+        # On Windows, relpath raises ValueError when path and root are on different mounts
+        # (e.g. a UNC share root vs a drive-letter path). Nothing to find in this case.
+        log.warning("Path %r not in %r", path, root)
+        return []
 
     # Search each of /a/b/c, /a/b, /a
     while dirs:
@@ -315,17 +321,24 @@ def format_docstring(
         contents = ""
 
     if markup_kind == "markdown":
-        try:
-            value = docstring_to_markdown.convert(contents)
-        except docstring_to_markdown.UnknownFormatError:
-            # try to escape the Markdown syntax instead:
-            value = escape_markdown(contents)
-
-        if signatures:
-            wrapped_signatures = convert_signatures_to_markdown(
-                signatures, config=signature_config or {}
-            )
-            value = wrapped_signatures + "\n\n" + value
+        wrapped_signatures = convert_signatures_to_markdown(
+            signatures if signatures is not None else [], config=signature_config or {}
+        )
+
+        if contents != "":
+            try:
+                value = docstring_to_markdown.convert(contents)
+            except docstring_to_markdown.UnknownFormatError:
+                # try to escape the Markdown syntax instead:
+                value = escape_markdown(contents)
+
+            if signatures:
+                value = wrapped_signatures + "\n\n" + value
+        else:
+            value = contents
+
+            if signatures:
+                value = wrapped_signatures
 
         return {"kind": "markdown", "value": value}
     value = contents
diff --git a/pylsp/config/schema.json b/pylsp/config/schema.json
@@ -91,7 +91,10 @@
       "description": "List of errors and warnings to ignore (or skip)."
     },
     "pylsp.plugins.flake8.maxComplexity": {
-      "type": "integer",
+      "type": [
+        "integer",
+        "null"
+      ],
       "default": null,
       "description": "Maximum allowed complexity threshold."
     },
@@ -530,8 +533,13 @@
       "default": "black",
       "description": "Formatter to use for reformatting signatures in docstrings."
     },
+    "pylsp.signature.include_docstring": {
+      "type": "boolean",
+      "default": true,
+      "description": "Include signature docstring."
+    },
     "pylsp.signature.line_length": {
-      "type": "number",
+      "type": "integer",
       "default": 88,
       "description": "Maximum line length in signatures."
     }
diff --git a/pylsp/plugins/definition.py b/pylsp/plugins/definition.py
@@ -71,7 +71,10 @@ def pylsp_definitions(
             },
         }
         for d in definitions
-        if d.is_definition() and (follow_builtin_defns or _not_internal_definition(d))
+        if d.is_definition()
+        and d.line is not None
+        and d.column is not None
+        and (follow_builtin_defns or _not_internal_definition(d))
     ]
 
 
diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
@@ -34,6 +34,13 @@
     | {"E999"}
 )
 
+if sys.platform == "win32":
+    from subprocess import CREATE_NO_WINDOW
+else:
+    # CREATE_NO_WINDOW flag only available on Windows.
+    # Set constant as default `Popen` `creationflag` kwarg value (`0`)
+    CREATE_NO_WINDOW = 0
+
 
 @hookimpl
 def pylsp_settings():
@@ -128,7 +135,7 @@ def run_flake8(flake8_executable, args, document, source):
         )
 
     log.debug("Calling %s with args: '%s'", flake8_executable, args)
-    popen_kwargs = {}
+    popen_kwargs = {"creationflags": CREATE_NO_WINDOW}
     if cwd := document._workspace.root_path:
         popen_kwargs["cwd"] = cwd
     try:
diff --git a/pylsp/plugins/hover.py b/pylsp/plugins/hover.py
@@ -41,10 +41,19 @@ def pylsp_hover(config, document, position):
         "",
     )
 
+    include_docstring = signature_config.get("include_docstring", True)
+
+    # raw docstring returns only doc, without signature
+    docstring = definition.docstring(raw=True)
+    if not include_docstring:
+        if signature:
+            docstring = ""
+        else:
+            docstring = docstring.strip().split("\n")[0].strip()
+
     return {
         "contents": _utils.format_docstring(
-            # raw docstring returns only doc, without signature
-            definition.docstring(raw=True),
+            docstring,
             preferred_markup_kind,
             signatures=[signature] if signature else None,
             signature_config=signature_config,
diff --git a/pylsp/plugins/signature.py b/pylsp/plugins/signature.py
@@ -17,6 +17,7 @@
 
 @hookimpl
 def pylsp_signature_help(config, document, position):
+    signature_config = config.settings().get("signature", {})
     code_position = _utils.position_to_jedi_linecolumn(document, position)
     signatures = document.jedi_script().get_signatures(**code_position)
 
@@ -41,10 +42,15 @@ def pylsp_signature_help(config, document, position):
     # Docstring contains one or more lines of signature, followed by empty line, followed by docstring
     function_sig_lines = (docstring.split("\n\n") or [""])[0].splitlines()
     function_sig = " ".join([line.strip() for line in function_sig_lines])
+
+    signature_docstring = s.docstring(raw=True)
+    if not signature_config.get("include_docstring", True):
+        signature_docstring = ""
+
     sig = {
         "label": function_sig,
         "documentation": _utils.format_docstring(
-            s.docstring(raw=True), markup_kind=preferred_markup_kind
+            signature_docstring, markup_kind=preferred_markup_kind
         ),
     }
 
diff --git a/pylsp/python_lsp.py b/pylsp/python_lsp.py
@@ -4,6 +4,7 @@
 import logging
 import os
 import socketserver
+import sys
 import threading
 import uuid
 from functools import partial
@@ -71,9 +72,13 @@ def shutdown_server(check_parent_process, *args):
         handler_class.__name__ + "Handler",
         (_StreamHandlerWrapper,),
         {
-            "DELEGATE_CLASS": partial(
-                handler_class, check_parent_process=check_parent_process
-            ),
+            # We need to wrap this in staticmethod due to the changes to
+            # functools.partial in Python 3.14+
+            "DELEGATE_CLASS": staticmethod(
+                partial(handler_class, check_parent_process=check_parent_process)
+            )
+            if sys.version_info >= (3, 14)
+            else partial(handler_class, check_parent_process=check_parent_process),
             "SHUTDOWN_CALL": partial(shutdown_server, check_parent_process),
         },
     )
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,7 +35,7 @@ all = [
     "pycodestyle>=2.12.0,<2.13.0",
     "pydocstyle>=6.3.0,<6.4.0",
     "pyflakes>=3.2.0,<3.3.0",
-    "pylint>=3.1,<4",
+    "pylint>=3.1,<4.1.0",
     "rope>=1.11.0",
     "yapf>=0.33.0",
     "whatthepatch>=1.0.2,<2.0.0"
@@ -46,12 +46,12 @@ mccabe = ["mccabe>=0.7.0,<0.8.0"]
 pycodestyle = ["pycodestyle>=2.12.0,<2.13.0"]
 pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"]
 pyflakes = ["pyflakes>=3.2.0,<3.3.0"]
-pylint = ["pylint>=3.1,<4"]
+pylint = ["pylint>=3.1,<4.1.0"]
 rope = ["rope>=1.11.0"]
 yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"]
 websockets = ["websockets>=10.3"]
 test = [
-    "pylint>=3.1,<4",
+    "pylint>=3.1,<4.1.0",
     "pytest",
     "pytest-cov",
     "coverage",
diff --git a/test/fixtures.py b/test/fixtures.py
@@ -177,3 +177,17 @@ def client_server_pair() -> None:
     ).result(timeout=CALL_TIMEOUT_IN_SECONDS)
     assert shutdown_response is None
     client_server_pair_obj.client._endpoint.notify("exit")
+
+
+@pytest.fixture
+def workspace_with_signature_docstring_disabled(workspace) -> None:
+    workspace._config.update(
+        {
+            "signature": {
+                **workspace._config.settings().get("signature", {}),
+                "include_docstring": False,
+            },
+        }
+    )
+
+    yield workspace
diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
@@ -181,7 +181,7 @@ def test_jedi_completion_with_fuzzy_enabled(config, workspace) -> None:
 
     assert items
 
-    expected = "isabs(s)"
+    expected = "commonprefix(m)" if JEDI_VERSION < "0.19.2" else "isabs(s)"
     assert items[0]["label"] == expected
 
     # Test we don't throw with big character
@@ -322,7 +322,7 @@ def test_matplotlib_completions(config, workspace) -> None:
 
 
 def test_snippets_completion(config, workspace) -> None:
-    doc_snippets = "from collections import defaultdict \na=defaultdict"
+    doc_snippets = "from collections import defaultdict \ndef foo(a): pass\nfoo"
     com_position = {"line": 0, "character": 35}
     doc = Document(DOC_URI, workspace, doc_snippets)
     config.capabilities["textDocument"] = {
@@ -332,9 +332,9 @@ def test_snippets_completion(config, workspace) -> None:
     completions = pylsp_jedi_completions(config, doc, com_position)
     assert completions[0]["insertText"] == "defaultdict"
 
-    com_position = {"line": 1, "character": len(doc_snippets)}
+    com_position = {"line": 2, "character": 3}
     completions = pylsp_jedi_completions(config, doc, com_position)
-    assert completions[0]["insertText"] == "defaultdict($0)"
+    assert completions[0]["insertText"] == "foo($0)"
     assert completions[0]["insertTextFormat"] == lsp.InsertTextFormat.Snippet
 
 
diff --git a/test/plugins/test_definitions.py b/test/plugins/test_definitions.py
diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py
diff --git a/test/plugins/test_hover.py b/test/plugins/test_hover.py
diff --git a/test/plugins/test_signature.py b/test/plugins/test_signature.py
diff --git a/test/test_utils.py b/test/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,10 @@ def pylsp_definitions(`
`71`	`71`	`},`
`72`	`72`	`}`
`73`	`73`	`for d in definitions`
`74`		`- if d.is_definition() and (follow_builtin_defns or _not_internal_definition(d))`
	`74`	`+ if d.is_definition()`
	`75`	`+ and d.line is not None`
	`76`	`+ and d.column is not None`
	`77`	`+ and (follow_builtin_defns or _not_internal_definition(d))`
`75`	`78`	`]`
`76`	`79`
`77`	`80`