Switch from flake8 + isort + pylint to ruff

Kozea · Nov 21, 2023 · 816945b · 816945b
1 parent 6f83186
commit 816945b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 271 deletions.
diff --git a/.isort.cfg b/.isort.cfg
diff --git a/.pylintrc b/.pylintrc
diff --git a/Makefile b/Makefile
@@ -13,8 +13,7 @@ clean:
 	rm -fr *.egg-info
 
 lint:
-	$(FLAKE8) $(PROJECT_NAME)
-	$(PYTEST) --isort -m isort $(PROJECT_NAME)
+	$(RUFF) $(PROJECT_NAME)
 
 fix:
 	$(VENV)/bin/yapf -p -i pygal/**/*.py

diff --git a/Makefile.config b/Makefile.config
@@ -3,7 +3,7 @@ PROJECT_NAME = pygal
 # Python env
 PYTHON_VERSION ?= python
 VENV = $(PWD)/.env$(if $(filter $(PYTHON_VERSION),python),,-$(PYTHON_VERSION))
-FLAKE8 = $(VENV)/bin/flake8
+RUFF = $(VENV)/bin/ruff
 PIP = $(VENV)/bin/pip
 PYTHON = $(VENV)/bin/python
 PYTEST = $(VENV)/bin/py.test

diff --git a/ruff.toml b/ruff.toml
@@ -0,0 +1,23 @@
+extend-select = [
+    "E",
+    "F",
+    "I",
+    "W",
+    "PLC",
+    "PLE",
+    "PLW",
+    # "PLR",  # TODO: enable?
+]
+
+ignore = [
+    "E731",
+    "E741",
+    "PLW2901",  # TODO: do not ignore?
+    "PLW3301",  # TODO: do not ignore?
+]
+
+[per-file-ignores]
+"pygal/__init__.py" = [
+    "E402",
+    "F401",
+]
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
@@ -43,8 +43,8 @@ def run_tests(self):
 tests_requirements = [
     "pyquery", "flask", 'cairosvg', 'lxml', 'pygal_maps_world', 'pygal_maps_fr',
     'pygal_maps_ch', 'coveralls',
-    'flake8',
-    'pytest-runner', 'pytest-cov', 'pytest-isort',
+    'ruff',
+    'pytest-runner', 'pytest-cov',
     'pytest'
 ]
 

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,6 @@ envlist = py38,py39,py310,py311,py312,pypy
 
 [testenv]
 deps =
-     flake8
      pytest
      coverage
      lxml
@@ -12,10 +11,9 @@ deps =
 
 setenv =
     COVERAGE_FILE=.cov-{envname}
-
 commands =
-  coverage run --source=pygal {envbindir}/py.test {posargs:pygal/test} --junitxml=junit-{envname}.xml
-  coverage xml -o coverage-{envname}.xml
+    coverage run --source=pygal {envbindir}/py.test {posargs:pygal/test} --junitxml=junit-{envname}.xml
+    coverage xml -o coverage-{envname}.xml
 
 [gh]
 python =