Merge pull request #683 from SUNET/ylle_evaluating_ruff

Evaluating ruff

.devcontainer/devcontainer.json

@@ -1,28 +1,24 @@
 {
 	"name": "Python 3",
 	"build": {
-		"dockerfile": "Dockerfile",
+		"dockerfile": "Dockerfile"
 	},
 	"customizations": {
 		"vscode": {
 			"settings": {
 				"python.defaultInterpreterPath": "/usr/local/bin/python",
-				"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-				"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-				"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
 				"cSpell.language": "en-GB,en,sv"
 			},
 			"extensions": [
 				"ms-python.python",
 				"ms-python.vscode-pylance",
 				"ms-python.mypy-type-checker",
-				"ms-python.black-formatter",
 				"tabbyml.vscode-tabby",
 				"GitHub.vscode-pull-request-github",
 				"streetsidesoftware.code-spell-checker",
 				"streetsidesoftware.code-spell-checker-swedish",
 				"ms-vscode.makefile-tools",
-				"ms-python.isort"
+				"charliermarsh.ruff"
 			]
 		}
 	},

.github/workflows/run-tests.yaml

@@ -67,3 +67,19 @@ jobs:
           mypy --version
           make typecheck
 
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff
+      # Update output format to enable automatic inline annotations.
+      - name: Run Ruff
+        run: ruff check --output-format=github .
+

.vscode/extensions.json

@@ -1,6 +1,5 @@
 {
     "recommendations": [
         "streetsidesoftware.code-spell-checker",
-        "ms-python.isort"
     ]
 }

.vscode/settings.json

@@ -4,12 +4,10 @@
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "black-formatter.args": [
-        "--line-length 120"
-    ],
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter"
-    },    
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    },
     "terminal.integrated.env.linux": {
         "PYTHONPATH": "${workspaceFolder}/src"
     },

Makefile

@@ -13,8 +13,13 @@ test:
 	PYTHONPATH=$(SRCDIR) pytest -vvv -ra --log-cli-level DEBUG
 
 reformat:
-	isort --line-width 120 --atomic --project eduid $(SOURCE)
-	black --line-length 120 --target-version py310 $(SOURCE)
+	# sort imports and remove unused imports
+	ruff check --select F401,I --fix
+	# reformat
+	ruff format
+
+lint:
+	ruff check
 
 typecheck:
 	MYPYPATH=$(SRCDIR) mypy $(MYPY_ARGS) --namespace-packages -p eduid