Merge pull request #286 from andreasgriffin/ruff-all

Ruff

Author: andreasgriffin

.pre-commit-config.yaml

@@ -13,29 +13,23 @@ repos:
         language: system
         files: ^tools/resources/linux-bitcoin-safe\.desktop$
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2  # Use the specified version of isort
-    hooks:
-      - id: isort
-        args:
-          - --profile=black  # Set the import order style (change 'google' to your preferred style)          
-  - repo: https://github.com/myint/autoflake
-    rev: v2.3.1  # Use the latest version of autoflake
-    hooks:
-      - id: autoflake
-        args:
-          - --expand-star-imports
-          - --remove-all-unused-imports
-          - --remove-unused-variables
-          - --in-place
-          - --exclude=__init__.py
-          - --remove-duplicate-keys 
-  - repo: https://github.com/ambv/black
-    rev: 25.1.0
-    hooks:
-    - id: black
-      language_version: python3.12
+  # - repo: https://github.com/asmeurer/removestar
+  #   rev: "1.5.2"
+  #   hooks:
+  #     - id: removestar
+  #       args: [-i] # See docs for all args (-i edits file in-place)
+  #       exclude: ^(bitcoin_safe/stubs)
 
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.13.1  
+    hooks:
+      # Lint + auto-fix (includes import sorting, unused imports, etc.)
+      - id: ruff-format
+      - id: ruff-check
+        args: [--fix, --exit-non-zero-on-fix]
+        # If you don't want to run on notebooks, uncomment:
+        # types_or: [python, pyi]
+      # Formatter (Black-compatible)
 
 
   - repo: https://github.com/pre-commit/mirrors-mypy
@@ -70,6 +64,7 @@ repos:
           - pyqt6 
 
 
+
   - repo: local
     hooks:
       - id: pyright
@@ -79,28 +74,22 @@ repos:
         types: [python]
         pass_filenames: false
 
-
-
-
   - repo: local
     hooks:
       - id: update-poetry-version
         name: Update Poetry Version
-        entry: python .update_version.py  
+        entry: python .update_version.py
         language: python
         always_run: true
         files: pyproject.toml
         additional_dependencies:
           - tomlkit
-
-  - repo: local
-    hooks:
-      - id: update-poetry-version
-        name: Update Poetry Version
+          
+      - id: optional-precommit-checks
+        name: Optional Precommit Checks
         entry: python .optional_precommit_checks.py
         language: python
         always_run: true
-        
 
 
 

.update_version.py

@@ -26,14 +26,17 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from __future__ import annotations
+
 import tomlkit
 
 from bitcoin_safe import __version__
 
 
 def update_poetry_version(file_path, new_version):
     # Read the pyproject.toml file
-    with open(file_path, "r") as file:
+    """Update poetry version."""
+    with open(file_path) as file:
         data = tomlkit.load(file)
 
     # Update the version under tool.poetry

bitcoin_safe/__main__.py

@@ -6,22 +6,22 @@
 
 setup_logging()
 
-from bitcoin_safe.dynamic_lib_load import ensure_pyzbar_works, set_os_env_ssl_certs
+from bitcoin_safe.dynamic_lib_load import ensure_pyzbar_works, set_os_env_ssl_certs  # noqa: E402
 
 set_os_env_ssl_certs()
 ensure_pyzbar_works()
 
 
-from PyQt6.QtWidgets import QApplication
+from PyQt6.QtWidgets import QApplication  # noqa: E402
 
-from bitcoin_safe.compatibility import check_compatibility
-from bitcoin_safe.gnome_darkmode import is_gnome_dark_mode, set_dark_palette
-from bitcoin_safe.gui.qt.main import MainWindow
-from bitcoin_safe.gui.qt.util import custom_exception_handler
+from bitcoin_safe.compatibility import check_compatibility  # noqa: E402
+from bitcoin_safe.gnome_darkmode import is_gnome_dark_mode, set_dark_palette  # noqa: E402
+from bitcoin_safe.gui.qt.main import MainWindow  # noqa: E402
+from bitcoin_safe.gui.qt.util import custom_exception_handler  # noqa: E402
 
 
 def parse_args() -> argparse.Namespace:
-
+    """Parse args."""
     parser = argparse.ArgumentParser(description="Bitcoin Safe")
     parser.add_argument("--network", help="Choose the network: bitcoin, regtest, testnet, signet ")
     parser.add_argument(
@@ -39,6 +39,7 @@ def parse_args() -> argparse.Namespace:
 
 
 def main() -> None:
+    """Main."""
     args = parse_args()
 
     sys.excepthook = custom_exception_handler