Merge branch 'develop' into codegen/epic/2205/task/88650/solve/25068

agserrano3 · web-flow · commit 622aa2dfb87a · 2024-07-24T20:01:47.000+02: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@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: static-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: static-pip-
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           # TODO: check with Python 3, but need to fix the
           # errors first
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -27,13 +27,13 @@ jobs:
         PYTHON_VERSION: ['3.10', '3.9', '3.8']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         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@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'
diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -27,13 +27,13 @@ jobs:
         PYTHON_VERSION: ['3.10', '3.9', '3.8']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         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@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'
diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -27,13 +27,13 @@ jobs:
         PYTHON_VERSION: ['3.10', '3.9', '3.8']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         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@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'
diff --git a/CONFIGURATION.md b/CONFIGURATION.md
@@ -9,6 +9,7 @@ This server can be configured using the `workspace/didChangeConfiguration` metho
 | `pylsp.plugins.flake8.enabled` | `boolean` | Enable or disable the plugin. | `false` |
 | `pylsp.plugins.flake8.exclude` | `array` of `string` items | List of files or directories to exclude. | `[]` |
 | `pylsp.plugins.flake8.extendIgnore` | `array` of `string` items | List of errors and warnings to append to ignore list. | `[]` |
+| `pylsp.plugins.flake8.extendSelect` | `array` of `string` items | List of errors and warnings to append to select list. | `[]` |
 | `pylsp.plugins.flake8.executable` | `string` | Path to the flake8 executable. | `"flake8"` |
 | `pylsp.plugins.flake8.filename` | `string` | Only check for filenames matching the patterns in this list. | `null` |
 | `pylsp.plugins.flake8.hangClosing` | `boolean` | Hang closing bracket instead of matching indentation of opening bracket's line. | `null` |
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ sudo apt-get install python3-pylsp
 or Fedora Linux
 
 ```
-sudo dnf install python-lsp-server
+sudo dnf install python3-lsp-server
 ```
 
 or Arch Linux
diff --git a/pylsp/config/flake8_conf.py b/pylsp/config/flake8_conf.py
@@ -27,6 +27,7 @@
     # flake8
     ("exclude", "plugins.flake8.exclude", list),
     ("extend-ignore", "plugins.flake8.extendIgnore", list),
+    ("extend-select", "plugins.flake8.extendSelect", list),
     ("filename", "plugins.flake8.filename", list),
     ("hang-closing", "plugins.flake8.hangClosing", bool),
     ("ignore", "plugins.flake8.ignore", list),
diff --git a/pylsp/config/schema.json b/pylsp/config/schema.json
@@ -53,6 +53,14 @@
       },
       "description": "List of errors and warnings to append to ignore list."
     },
+    "pylsp.plugins.flake8.extendSelect": {
+      "type": "array",
+      "default": [],
+      "items": {
+        "type": "string"
+      },
+      "description": "List of errors and warnings to append to select list."
+    },
     "pylsp.plugins.flake8.executable": {
       "type": "string",
       "default": "flake8",
@@ -500,4 +508,4 @@
       "description": "The name of the folder in which rope stores project configurations and data.  Pass `null` for not using such a folder at all."
     }
   }
-}
+}
diff --git a/pylsp/config/source.py b/pylsp/config/source.py
@@ -53,16 +53,16 @@ def _get_opt(cls, config, key, option, opt_type):
             if not config.has_option(key, opt_key):
                 continue
 
-            if opt_type == bool:
+            if opt_type is bool:
                 return config.getboolean(key, opt_key)
 
-            if opt_type == int:
+            if opt_type is int:
                 return config.getint(key, opt_key)
 
-            if opt_type == str:
+            if opt_type is str:
                 return config.get(key, opt_key)
 
-            if opt_type == list:
+            if opt_type is list:
                 return cls._parse_list_opt(config.get(key, opt_key))
 
             raise ValueError("Unknown option type: %s" % opt_type)
diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
@@ -72,6 +72,7 @@ def pylsp_lint(workspace, document):
             "config": settings.get("config"),
             "exclude": settings.get("exclude"),
             "extend-ignore": settings.get("extendIgnore"),
+            "extend-select": settings.get("extendSelect"),
             "filename": settings.get("filename"),
             "hang-closing": settings.get("hangClosing"),
             "ignore": ignores or None,
diff --git a/pylsp/python_lsp.py b/pylsp/python_lsp.py
@@ -442,13 +442,17 @@ def lint(self, doc_uri, is_saved) -> None:
         workspace = self._match_uri_to_workspace(doc_uri)
         document_object = workspace.documents.get(doc_uri, None)
         if isinstance(document_object, Document):
-            self._lint_text_document(doc_uri, workspace, is_saved=is_saved)
+            self._lint_text_document(
+                doc_uri, workspace, is_saved, document_object.version
+            )
         elif isinstance(document_object, Notebook):
             self._lint_notebook_document(document_object, workspace)
 
-    def _lint_text_document(self, doc_uri, workspace, is_saved) -> None:
+    def _lint_text_document(self, doc_uri, workspace, is_saved, doc_version=None) -> None:
         workspace.publish_diagnostics(
-            doc_uri, flatten(self._hook("pylsp_lint", doc_uri, is_saved=is_saved))
+            doc_uri,
+            flatten(self._hook("pylsp_lint", doc_uri, is_saved=is_saved)),
+            doc_version,
         )
 
     def _lint_notebook_document(self, notebook_document, workspace) -> None:
diff --git a/pylsp/workspace.py b/pylsp/workspace.py
@@ -41,6 +41,7 @@ class Workspace:
     M_INITIALIZE_PROGRESS = "window/workDoneProgress/create"
     M_APPLY_EDIT = "workspace/applyEdit"
     M_SHOW_MESSAGE = "window/showMessage"
+    M_LOG_MESSAGE = "window/logMessage"
 
     def __init__(self, root_uri, endpoint, config=None) -> None:
         self._config = config
@@ -176,10 +177,18 @@ def update_config(self, settings):
     def apply_edit(self, edit):
         return self._endpoint.request(self.M_APPLY_EDIT, {"edit": edit})
 
-    def publish_diagnostics(self, doc_uri, diagnostics) -> None:
+    def publish_diagnostics(self, doc_uri, diagnostics, doc_version=None) -> None:
+        params = {
+            "uri": doc_uri,
+            "diagnostics": diagnostics,
+        }
+
+        if doc_version:
+            params["version"] = doc_version
+
         self._endpoint.notify(
             self.M_PUBLISH_DIAGNOSTICS,
-            params={"uri": doc_uri, "diagnostics": diagnostics},
+            params=params,
         )
 
     @contextmanager
@@ -316,6 +325,11 @@ def _progress_end(self, token: str, message: Optional[str] = None) -> None:
             },
         )
 
+    def log_message(self, message, msg_type=lsp.MessageType.Info):
+        self._endpoint.notify(
+            self.M_LOG_MESSAGE, params={"type": msg_type, "message": message}
+        )
+
     def show_message(self, message, msg_type=lsp.MessageType.Info) -> None:
         self._endpoint.notify(
             self.M_SHOW_MESSAGE, params={"type": msg_type, "message": message}
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,9 +28,9 @@ Homepage = "https://github.com/python-lsp/python-lsp-server"
 [project.optional-dependencies]
 all = [
     "autopep8>=2.0.4,<2.1.0",
-    "flake8>=7,<8",
+    "flake8>=7.1,<8",
     "mccabe>=0.7.0,<0.8.0",
-    "pycodestyle>=2.11.0,<2.12.0",
+    "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",
@@ -39,9 +39,9 @@ all = [
     "whatthepatch>=1.0.2,<2.0.0"
 ]
 autopep8 = ["autopep8>=2.0.4,<2.1.0"]
-flake8 = ["flake8>=7,<8"]
+flake8 = ["flake8>=7.1,<8"]
 mccabe = ["mccabe>=0.7.0,<0.8.0"]
-pycodestyle = ["pycodestyle>=2.11.0,<2.12.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"]
diff --git a/test/fixtures.py b/test/fixtures.py
@@ -3,7 +3,6 @@
 
 import os
 from io import StringIO
-from test.test_utils import CALL_TIMEOUT_IN_SECONDS, ClientServerPair
 from unittest.mock import MagicMock
 
 import pytest
@@ -15,6 +14,7 @@
 from pylsp.config.config import Config
 from pylsp.python_lsp import PythonLSPServer
 from pylsp.workspace import Document, Workspace
+from test.test_utils import CALL_TIMEOUT_IN_SECONDS, ClientServerPair
 
 DOC_URI = uris.from_fs_path(__file__)
 DOC = """import sys
diff --git a/test/plugins/test_autoimport.py b/test/plugins/test_autoimport.py
@@ -1,7 +1,5 @@
 # Copyright 2022- Python Language Server Contributors.
 
-from test.test_notebook_document import wait_for_condition
-from test.test_utils import send_initialize_request, send_notebook_did_open
 from typing import Any, Dict, List
 from unittest.mock import Mock, patch
 
@@ -22,6 +20,8 @@
     pylsp_completions as pylsp_autoimport_completions,
 )
 from pylsp.workspace import Workspace
+from test.test_notebook_document import wait_for_condition
+from test.test_utils import send_initialize_request, send_notebook_did_open
 
 DOC_URI = uris.from_fs_path(__file__)
 
diff --git a/test/test_configuration.py b/test/test_configuration.py
@@ -1,12 +1,12 @@
 # Copyright 2021- Python Language Server Contributors.
 
-from test.test_notebook_document import wait_for_condition
-from test.test_utils import send_initialize_request
 from unittest.mock import patch
 
 import pytest
 
 from pylsp import IS_WIN
+from test.test_notebook_document import wait_for_condition
+from test.test_utils import send_initialize_request
 
 INITIALIZATION_OPTIONS = {
     "pylsp": {
diff --git a/test/test_document.py b/test/test_document.py
@@ -1,9 +1,8 @@
 # Copyright 2017-2020 Palantir Technologies, Inc.
 # Copyright 2021- Python Language Server Contributors.
 
-from test.fixtures import DOC, DOC_URI
-
 from pylsp.workspace import Document
+from test.fixtures import DOC, DOC_URI
 
 
 def test_document_props(doc) -> None:
diff --git a/test/test_language_server.py b/test/test_language_server.py
@@ -4,12 +4,13 @@
 import os
 import sys
 import time
-from test.test_utils import ClientServerPair, send_initialize_request
 
 import pytest
 from flaky import flaky
 from pylsp_jsonrpc.exceptions import JsonRpcMethodNotFound
 
+from test.test_utils import ClientServerPair, send_initialize_request
+
 RUNNING_IN_CI = bool(os.environ.get("CI"))
 
 CALL_TIMEOUT_IN_SECONDS = 10
diff --git a/test/test_notebook_document.py b/test/test_notebook_document.py
@@ -1,18 +1,18 @@
 # Copyright 2021- Python Language Server Contributors.
 
 import time
-from test.test_utils import (
-    CALL_TIMEOUT_IN_SECONDS,
-    send_initialize_request,
-    send_notebook_did_open,
-)
 from unittest.mock import call, patch
 
 import pytest
 
 from pylsp import IS_WIN
 from pylsp.lsp import NotebookCellKind
 from pylsp.workspace import Notebook
+from test.test_utils import (
+    CALL_TIMEOUT_IN_SECONDS,
+    send_initialize_request,
+    send_notebook_did_open,
+)
 
 
 def wait_for_condition(condition, timeout=CALL_TIMEOUT_IN_SECONDS) -> None:
diff --git a/test/test_uris.py b/test/test_uris.py
@@ -1,11 +1,10 @@
 # Copyright 2017-2020 Palantir Technologies, Inc.
 # Copyright 2021- Python Language Server Contributors.
 
-from test import unix_only, windows_only
-
 import pytest
 
 from pylsp import uris
+from test import unix_only, windows_only
 
 
 @unix_only
