Allow ruff 0.2.x; disable default enabled formatters (#80)

magnuslarsen · Magnus Larsen · ccordoba12 · web-flow · commit f9824d2c53d4 · 2024-02-09T10:36:56.000+01:00
* Allow ruff 3.x; disable default enabled formatters

* bump minimum version to 0.2.0

Co-authored-by: Carlos Cordoba &lt;ccordoba12@gmail.com&gt;

* remove isort from disable list

---------

Co-authored-by: Magnus Larsen &lt;mlar@novozymes.com&gt;
Co-authored-by: Carlos Cordoba &lt;ccordoba12@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Python](https://github.com/python-lsp/python-lsp-ruff/actions/workflows/python.yml/badge.svg)](https://github.com/python-lsp/python-lsp-ruff/actions/workflows/python.yml)
 
 `python-lsp-ruff` is a plugin for `python-lsp-server` that adds linting, code action and formatting capabilities that are provided by [ruff](https://github.com/charliermarsh/ruff),
-an extremely fast Python linter written in Rust.
+an extremely fast Python linter and formatter written in Rust.
 
 ## Install
 
@@ -26,8 +26,8 @@ pip install "ruff<0.1.0" "python-lsp-ruff==1.5.3"
 
 ## Usage
 
-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`.
+This plugin will disable `pycodestyle`, `pyflakes`, `mccabe`, `autopep8`, and `yapf` by default, unless they are explicitly enabled in the client configuration.
+When `python-lsp-ruff` is enabled, all linting diagnostics and formatting capabilities will be provided by `ruff`.
 
 Any codes given in the `format` option will only be marked as `fixable` for ruff during the formatting operation, the user has to make sure that these codes are also in the list of codes that ruff checks!
 
@@ -38,7 +38,7 @@ Configuration options can be passed to the python-language-server. If a `pyproje
 file is present in the project, `python-lsp-ruff` will ignore specific options (see below).
 
 The plugin follows [python-lsp-server's configuration](https://github.com/python-lsp/python-lsp-server/#configuration).
-This example configuration using for `neovim` shows the possible optionsL
+This example configuration using for `neovim` shows the possible options:
 
 ```lua
 pylsp = {
diff --git a/pylsp_ruff/plugin.py b/pylsp_ruff/plugin.py
@@ -97,7 +97,8 @@ def pylsp_settings():
             "pyflakes": {"enabled": False},
             "mccabe": {"enabled": False},
             "pycodestyle": {"enabled": False},
-            "pyls_isort": {"enabled": False},
+            "yapf": {"enabled": False},
+            "autopep8": {"enabled": False},
         }
     }
     return converter.unstructure(settings)
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 license = {text = "MIT"}
 dependencies = [
-  "ruff>=0.1.5, <0.2.0",
+  "ruff>=0.2.0, <0.3.0",
   "python-lsp-server",
 	"cattrs!=23.2.1",
   "lsprotocol>=2022.0.0a1",

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ def pylsp_settings():`
`97`	`97`	`"pyflakes": {"enabled": False},`
`98`	`98`	`"mccabe": {"enabled": False},`
`99`	`99`	`"pycodestyle": {"enabled": False},`
`100`		`- "pyls_isort": {"enabled": False},`
	`100`	`+ "yapf": {"enabled": False},`
	`101`	`+ "autopep8": {"enabled": False},`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`	`return converter.unstructure(settings)`