Use Ruff for linting and formatting. By @SAMAD101 (#1980)

Author: SAMAD101

.git-blame-ignore-revs

@@ -3,3 +3,6 @@ b6a24debb78b953117a3f637db18942f370a4b85
 
 # Run pre-commit after adding ruff
 24e1dd5c561bc3da972e41e6fd61961f12a2fc9f
+
+# Apply ruff sort settings
+ba9f1bd3d77dbd0b9efeb1f2f91c743b97ec558e

.github/workflows/test.yml

@@ -22,9 +22,9 @@ jobs:
           python-version: 3.11
           pre-commit: true
 
-      - name: Test formatting with Flake8, ruff and Black
+      - name: Test formatting with ruff
         shell: bash
-        run: make lint
+        run: pre-commit run --all-files --show-diff-on-failure
 
   prepare-matrix:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -29,17 +29,19 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.257"
+    rev: v0.7.0
     hooks:
+      # Run the linter.
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+      # Run the formatter.
+      - id: ruff-format
 
   # format python files
-  - repo: https://github.com/psf/black
-    rev: 22.12.0
-    hooks:
-      - id: black
-        files: ^(src/vorta/|tests)
+  # - repo: https://github.com/psf/black
+  #   rev: 22.12.0
+  #   hooks:
+  #     - id: black
+  #       files: ^(src/vorta/|tests)
 
   # # run black on code embedded in docstrings
   # - repo: https://github.com/asottile/blacken-docs
@@ -56,12 +58,6 @@ repos:
   #           py39,
   #         ]
 
-  # check pep8 conformity using flake8
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-
 # configuration for the pre-commit.ci bot
 # only relevant when actually using the bot
 ci:

bin/.gitkeep

@@ -11,6 +11,7 @@
 import sys
 from pathlib import Path
 from typing import Generator, List, Optional
+
 from macholib.MachO import MachO
 
 

package/fix_app_qt_folder_names_for_codesign.py

@@ -1,14 +1,23 @@
-[tool.black]
-line-length = 120
-skip-string-normalization = true
-target-version = ['py39']
-include = "(src/vorta/|tests).*.py$"
-
 [build-system]
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [tool.ruff]
-select = ["T", "I"]
-exclude = ["package"]
-fixable = ["I"]
+line-length = 120
+# exclude = ["package", "build", "dist", ".git", ".idea", ".cache", ".tox", ".eggs", "./src/vorta/__init__.py", ".direnv", "env"]
+include = ["src/**/*.py", "tests/**/*.py"]
+
+[tool.ruff.lint]
+select = [
+    "E",  # Error
+    "F",  # pyflakes
+    "I",  # isort
+    "W",  # Warning
+    "YTT", # flake8-2020
+]
+ignore = [
+    "F401",
+]
+
+[tool.ruff.format]
+quote-style = "preserve"

pyproject.toml

@@ -1,6 +1,4 @@
-black==22.*
 coverage
-flake8
 macholib
 nox
 pkgconfig

requirements.d/dev.txt

@@ -72,16 +72,8 @@ source = vorta
 omit = tests/*
 relative_files = true
 
-[flake8]
-ignore =
-max-line-length = 120
-extend-ignore = E203,E121,E123,E126,E226,E24,E704,W503,W504
-exclude =
-    build,dist,.git,.idea,.cache,.tox,.eggs,
-    ./src/vorta/__init__.py,.direnv,env
-
 [tox:tox]
-envlist = py36,py37,py38,flake8
+envlist = py36,py37,py38
 skip_missing_interpreters = true
 
 [testenv]
@@ -92,10 +84,10 @@ deps =
 commands=pytest
 passenv = DISPLAY
 
-[testenv:flake8]
+[testenv:ruff]
 deps =
-    flake8
-commands=flake8 src tests
+    ruff
+commands=ruff check src tests
 
 [pycodestyle]
 max_line_length = 120

setup.cfg

@@ -135,7 +135,7 @@
         ],
         "tags": ["application:firefox", "type:browser", "os:linux"],
         "author": "Divi, Renner0E"
-    }
+    },
     {
         "name": "Mozilla Firefox Snap cache and config files",
         "slug": "firefox-snap-cache",

src/vorta/assets/exclusion_presets/browsers.json

@@ -31,7 +31,6 @@ def open_app_at_startup(enabled=True):
     while on Linux it adds a .desktop file at ~/.config/autostart
     """
     if sys.platform == 'darwin':
-
         url = NSURL.alloc().initFileURLWithPath_(APP_PATH)
         login_items = LSSharedFileListCreate(kCFAllocatorDefault, kLSSharedFileListSessionLoginItems, None)
         props = NSDictionary.dictionaryWithObject_forKey_(True, kLSSharedFileListItemHidden)