Merge pull request #312 from rtibblesbot/issue-311-e91a09

Replace flake8/isort with ruff, add uv supply-chain safety

Author: bjester

.github/dependabot.yml

@@ -9,6 +9,8 @@ updates:
       interval: "weekly"
       day: "friday"
       time: "00:00"
+    cooldown:
+      days: 7
   # Maintain dependencies for Github Actions
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -20,3 +22,5 @@ updates:
       github:
         patterns:
           - "actions/*"
+    cooldown:
+      days: 7

.pre-commit-config.yaml

@@ -3,23 +3,21 @@ repos:
     rev: v2.2.3
     hooks:
       - id: trailing-whitespace
-      - id: flake8
       - id: check-yaml
       - id: check-added-large-files
         exclude: 'uv.lock'
-      - id: debug-statements
       - id: end-of-file-fixer
         exclude: '^.+?\.json$'
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.8
     hooks:
-      - id: flake8
-        additional_dependencies: ['flake8-print==5.0.0']
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.4.0
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.11.3
     hooks:
-      - id: reorder-python-imports
-        language_version: python3
+      - id: uv-lock
   - repo: https://github.com/google/yamlfmt
     rev: v0.14.0
     hooks:

codecov.yml

@@ -1,25 +1,21 @@
 codecov:
   notify:
     require_ci_to_pass: yes
-
 coverage:
   precision: 2
   round: down
   range: "70...100"
-
   status:
     project: yes
     patch: yes
     changes: no
-
 parsers:
   gcov:
     branch_detection:
       conditional: yes
       loop: yes
       method: no
       macro: no
-
 comment:
   layout: "header, diff"
   behavior: default

docs/deletion/index.rst

@@ -19,4 +19,3 @@ There are times, such as GDPR removal requests, when it's necessary to actually
 This is handled using a ``HardDeletedModels`` table. Subclasses of ``SyncableModel`` should override the ``delete`` method to take a ``hard_delete`` boolean, and add the record to the ``HardDeletedModels`` table when this is passed.
 
 On serialization, Morango clears the ``serialized`` field entry in the store for records in ``HardDeletedModels`` and turns on the ``hard_deleted`` flag. Upon syncing with other Morango instances, the hard deletion will propagate to the store record of other instances.
-

docs/merging/index.rst

@@ -36,4 +36,3 @@ In the illustration above:
 5. When *Device A* syncs data with *Device B* again (the arrow), there is a conflict because both devices have modified ``r``.
 
 It is up to the implementing application to determine what the merge conflict resolution strategy is.
-

morango/__init__.py

@@ -1,5 +1,6 @@
 try:
     from importlib.metadata import version
+
     __version__ = version("morango")
 except ImportError:
     # Fallback for older Python versions or when package is not installed

morango/api/permissions.py

@@ -1,10 +1,7 @@
 import json
 
-from django.contrib.auth import authenticate
-from django.contrib.auth import get_user_model
-from rest_framework import authentication
-from rest_framework import exceptions
-from rest_framework import permissions
+from django.contrib.auth import authenticate, get_user_model
+from rest_framework import authentication, exceptions, permissions
 
 from morango.models.core import TransferSession
 from morango.utils import SETTINGS
@@ -61,11 +58,7 @@ def has_permission(self, request, view):
             if hasattr(request.user, "has_morango_certificate_scope_permission"):
                 scope_definition_id = request.data.get("scope_definition")
                 scope_params = json.loads(request.data.get("scope_params"))
-                if (
-                    scope_definition_id
-                    and scope_params
-                    and isinstance(scope_params, dict)
-                ):
+                if scope_definition_id and scope_params and isinstance(scope_params, dict):
                     return request.user.has_morango_certificate_scope_permission(
                         scope_definition_id, scope_params
                     )
@@ -89,9 +82,7 @@ def has_permission(self, request, view):
             sesh_id = request.query_params.get("transfer_session_id")
             if not sesh_id:
                 return False
-            if not TransferSession.objects.filter(
-                id=sesh_id, active=True, push=False
-            ).exists():
+            if not TransferSession.objects.filter(id=sesh_id, active=True, push=False).exists():
                 return False
             return True
 

morango/api/serializers.py

@@ -1,21 +1,21 @@
-from rest_framework import exceptions
-from rest_framework import serializers
+from rest_framework import exceptions, serializers
 from rest_framework.fields import ReadOnlyField
 
 from ..models.certificates import Nonce
-from ..models.core import Buffer
-from ..models.core import Certificate
-from ..models.core import InstanceIDModel
-from ..models.core import RecordMaxCounterBuffer
-from ..models.core import SyncSession
-from ..models.core import TransferSession
+from ..models.core import (
+    Buffer,
+    Certificate,
+    InstanceIDModel,
+    RecordMaxCounterBuffer,
+    SyncSession,
+    TransferSession,
+)
 from ..models.fields.crypto import SharedKey
 from ..utils import SETTINGS
 from .fields import PublicKeyField
 
 
 class CertificateSerializer(serializers.ModelSerializer):
-
     public_key = PublicKeyField()
 
     def validate_parent(self, parent):
@@ -60,8 +60,8 @@ class Meta:
 
 
 class SyncSessionSerializer(serializers.ModelSerializer):
-    client_instance = serializers.CharField(source='client_instance_json')
-    server_instance = serializers.CharField(source='server_instance_json')
+    client_instance = serializers.CharField(source="client_instance_json")
+    server_instance = serializers.CharField(source="server_instance_json")
 
     class Meta:
         model = SyncSession

morango/api/urls.py

@@ -1,24 +1,22 @@
 from rest_framework import routers
 
-from .viewsets import BufferViewSet
-from .viewsets import CertificateChainViewSet
-from .viewsets import CertificateViewSet
-from .viewsets import MorangoInfoViewSet
-from .viewsets import NonceViewSet
-from .viewsets import PublicKeyViewSet
-from .viewsets import SyncSessionViewSet
-from .viewsets import TransferSessionViewSet
+from .viewsets import (
+    BufferViewSet,
+    CertificateChainViewSet,
+    CertificateViewSet,
+    MorangoInfoViewSet,
+    NonceViewSet,
+    PublicKeyViewSet,
+    SyncSessionViewSet,
+    TransferSessionViewSet,
+)
 
 router = routers.SimpleRouter()
 router.register(r"certificates", CertificateViewSet, basename="certificates")
-router.register(
-    r"certificatechain", CertificateChainViewSet, basename="certificatechain"
-)
+router.register(r"certificatechain", CertificateChainViewSet, basename="certificatechain")
 router.register(r"nonces", NonceViewSet, basename="nonces")
 router.register(r"syncsessions", SyncSessionViewSet, basename="syncsessions")
-router.register(
-    r"transfersessions", TransferSessionViewSet, basename="transfersessions"
-)
+router.register(r"transfersessions", TransferSessionViewSet, basename="transfersessions")
 router.register(r"buffers", BufferViewSet, basename="buffers")
 router.register(r"morangoinfo", MorangoInfoViewSet, basename="morangoinfo")
 router.register(r"publickey", PublicKeyViewSet, basename="publickey")