Merge branch 'develop' into codegen/epic/2206/task/88357/solve/24775

Author: agserrano3

.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

.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'

.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'

.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'

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` |

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

pylsp/__main__.py

@@ -25,7 +25,7 @@
 )
 
 
-def add_arguments(parser):
+def add_arguments(parser) -> None:
     parser.description = "Python Language Server"
 
     parser.add_argument(
@@ -67,7 +67,7 @@ def add_arguments(parser):
     )
 
 
-def main():
+def main() -> None:
     parser = argparse.ArgumentParser()
     add_arguments(parser)
     args = parser.parse_args()
@@ -94,7 +94,7 @@ def _binary_stdio():
     return stdin, stdout
 
 
-def _configure_logger(verbose=0, log_config=None, log_file=None):
+def _configure_logger(verbose=0, log_config=None, log_file=None) -> None:
     root_logger = logging.root
 
     if log_config:

pylsp/_utils.py

@@ -88,7 +88,7 @@ def find_parents(root, path, names):
         return []
 
     if not os.path.commonprefix((root, path)):
-        log.warning("Path %s not in %s", path, root)
+        log.warning("Path %r not in %r", path, root)
         return []
 
     # Split the relative by directory, generate all the parent directories, then check each of them.

pylsp/config/config.py

@@ -43,7 +43,7 @@ def _hookexec(
 
 
 class Config:
-    def __init__(self, root_uri, init_opts, process_id, capabilities):
+    def __init__(self, root_uri, init_opts, process_id, capabilities) -> None:
         self._root_path = uris.to_fs_path(root_uri)
         self._root_uri = root_uri
         self._init_opts = init_opts
@@ -185,14 +185,14 @@ def plugin_settings(self, plugin, document_path=None):
             .get(plugin, {})
         )
 
-    def update(self, settings):
+    def update(self, settings) -> None:
         """Recursively merge the given settings into the current settings."""
         self.settings.cache_clear()
         self._settings = settings
         log.info("Updated settings to %s", self._settings)
         self._update_disabled_plugins()
 
-    def _update_disabled_plugins(self):
+    def _update_disabled_plugins(self) -> None:
         # All plugins default to enabled
         self._disabled_plugins = [
             plugin

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),

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."
     }
   }
-}
+}

pylsp/config/source.py

@@ -12,18 +12,18 @@
 class ConfigSource:
     """Base class for implementing a config source."""
 
-    def __init__(self, root_path):
+    def __init__(self, root_path) -> None:
         self.root_path = root_path
         self.is_windows = sys.platform == "win32"
         self.xdg_home = os.environ.get(
             "XDG_CONFIG_HOME", os.path.expanduser("~/.config")
         )
 
-    def user_config(self):
+    def user_config(self) -> None:
         """Return user-level (i.e. home directory) configuration."""
         raise NotImplementedError()
 
-    def project_config(self, document_path):
+    def project_config(self, document_path) -> None:
         """Return project-level (i.e. workspace directory) configuration."""
         raise NotImplementedError()
 
@@ -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)

pylsp/hookspecs.py

@@ -10,12 +10,12 @@ def pylsp_code_actions(config, workspace, document, range, context):
 
 
 @hookspec
-def pylsp_code_lens(config, workspace, document):
+def pylsp_code_lens(config, workspace, document) -> None:
     pass
 
 
 @hookspec
-def pylsp_commands(config, workspace):
+def pylsp_commands(config, workspace) -> None:
     """The list of command strings supported by the server.
 
     Returns:
@@ -24,110 +24,112 @@ def pylsp_commands(config, workspace):
 
 
 @hookspec
-def pylsp_completions(config, workspace, document, position, ignored_names):
+def pylsp_completions(config, workspace, document, position, ignored_names) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_completion_item_resolve(config, workspace, document, completion_item):
+def pylsp_completion_item_resolve(config, workspace, document, completion_item) -> None:
     pass
 
 
 @hookspec
-def pylsp_definitions(config, workspace, document, position):
+def pylsp_definitions(config, workspace, document, position) -> None:
     pass
 
 
 @hookspec
-def pylsp_dispatchers(config, workspace):
+def pylsp_dispatchers(config, workspace) -> None:
     pass
 
 
 @hookspec
-def pylsp_document_did_open(config, workspace, document):
+def pylsp_document_did_open(config, workspace, document) -> None:
     pass
 
 
 @hookspec
-def pylsp_document_did_save(config, workspace, document):
+def pylsp_document_did_save(config, workspace, document) -> None:
     pass
 
 
 @hookspec
-def pylsp_document_highlight(config, workspace, document, position):
+def pylsp_document_highlight(config, workspace, document, position) -> None:
     pass
 
 
 @hookspec
-def pylsp_document_symbols(config, workspace, document):
+def pylsp_document_symbols(config, workspace, document) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_execute_command(config, workspace, command, arguments):
+def pylsp_execute_command(config, workspace, command, arguments) -> None:
     pass
 
 
 @hookspec
-def pylsp_experimental_capabilities(config, workspace):
+def pylsp_experimental_capabilities(config, workspace) -> None:
     pass
 
 
 @hookspec
-def pylsp_folding_range(config, workspace, document):
+def pylsp_folding_range(config, workspace, document) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_format_document(config, workspace, document, options):
+def pylsp_format_document(config, workspace, document, options) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_format_range(config, workspace, document, range, options):
+def pylsp_format_range(config, workspace, document, range, options) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_hover(config, workspace, document, position):
+def pylsp_hover(config, workspace, document, position) -> None:
     pass
 
 
 @hookspec
-def pylsp_initialize(config, workspace):
+def pylsp_initialize(config, workspace) -> None:
     pass
 
 
 @hookspec
-def pylsp_initialized():
+def pylsp_initialized() -> None:
     pass
 
 
 @hookspec
-def pylsp_lint(config, workspace, document, is_saved):
+def pylsp_lint(config, workspace, document, is_saved) -> None:
     pass
 
 
 @hookspec
-def pylsp_references(config, workspace, document, position, exclude_declaration):
+def pylsp_references(
+    config, workspace, document, position, exclude_declaration
+) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_rename(config, workspace, document, position, new_name):
+def pylsp_rename(config, workspace, document, position, new_name) -> None:
     pass
 
 
 @hookspec
-def pylsp_settings(config):
+def pylsp_settings(config) -> None:
     pass
 
 
 @hookspec(firstresult=True)
-def pylsp_signature_help(config, workspace, document, position):
+def pylsp_signature_help(config, workspace, document, position) -> None:
     pass
 
 
 @hookspec
-def pylsp_workspace_configuration_changed(config, workspace):
+def pylsp_workspace_configuration_changed(config, workspace) -> None:
     pass

pylsp/plugins/_resolvers.py

@@ -15,7 +15,7 @@
 # ---- Base class
 # -----------------------------------------------------------------------------
 class Resolver:
-    def __init__(self, callback, resolve_on_error, time_to_live=60 * 30):
+    def __init__(self, callback, resolve_on_error, time_to_live=60 * 30) -> None:
         self.callback = callback
         self.resolve_on_error = resolve_on_error
         self._cache = {}
@@ -33,7 +33,7 @@ def cached_modules(self):
     def cached_modules(self, new_value):
         self._cached_modules = set(new_value)
 
-    def clear_outdated(self):
+    def clear_outdated(self) -> None:
         now = self.time_key()
         to_clear = [timestamp for timestamp in self._cache_ttl if timestamp < now]
         for time_key in to_clear: