diff --git a/README.md b/README.md index aa1c2c3..2b393b5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ There also exists an [AUR package](https://aur.archlinux.org/packages/python-lsp # Usage -This plugin will disable `flake8`, `pycodestyle`, `pyflakes`, `mccabe` and `pyls_isort` by default. +This plugin will disable `pycodestyle`, `pyflakes`, `mccabe` and `pyls_isort` by default, unless they are explicitly enabled in the client configuration. When enabled, all linting diagnostics will be provided by `ruff`. Sorting of the imports through `ruff` when formatting is enabled by default. The list of code fixes can be changed via the `pylsp.plugins.ruff.format` option. diff --git a/pylsp_ruff/plugin.py b/pylsp_ruff/plugin.py index c9c62e1..2342b99 100644 --- a/pylsp_ruff/plugin.py +++ b/pylsp_ruff/plugin.py @@ -64,12 +64,12 @@ @hookimpl def pylsp_settings(): log.debug("Initializing pylsp_ruff") - # this plugin disables flake8, mccabe, and pycodestyle by default + # This plugin disables some enabled-by-default plugins that duplicate Ruff + # functionality settings = { "plugins": { "ruff": PluginSettings(), "pyflakes": {"enabled": False}, - "flake8": {"enabled": False}, "mccabe": {"enabled": False}, "pycodestyle": {"enabled": False}, "pyls_isort": {"enabled": False}, diff --git a/pyproject.toml b/pyproject.toml index bd52059..f96f12e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,13 +7,13 @@ name = "python-lsp-ruff" authors = [ {name = "Julian Hossbach", email = "julian.hossbach@gmx.de"} ] -version = "1.5.2" +version = "1.5.3" description = "Ruff linting plugin for pylsp" readme = "README.md" requires-python = ">=3.7" license = {text = "MIT"} dependencies = [ - "ruff>=0.0.267", + "ruff>=0.0.267,<0.1.0", "python-lsp-server", "lsprotocol>=2022.0.0a1", "tomli>=1.1.0; python_version < '3.11'",