morango 0.8.3__tar.gz → 0.8.4__tar.gz

{morango-0.8.3 → morango-0.8.4}/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 List of the most important changes for each release.
 
+## 0.8.4
+- Adds syncable_objects model manager to use by default for all syncing operations, to allow default objects to be overridden
+
 ## 0.8.3
 - Adds error handling in the case that an incompatible cffi version is used in with Python 3.13
 - Update Python rsa package dependency to 4.9

{morango-0.8.3 → morango-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morango
-Version: 0.8.3
+Version: 0.8.4
 Summary: Pure Python sqlite-based Django DB replication engine.
 Home-page: https://github.com/learningequality/morango
 Author: Learning Equality

morango-0.8.4/morango/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.4"

{morango-0.8.3 → morango-0.8.4}/morango/models/core.py

@@ -473,7 +473,7 @@ class Store(AbstractStore):
             # imports core models.
             from morango.sync.utils import mute_signals
             with mute_signals(signals.post_delete):
-                klass_model.objects.filter(id=self.id).delete()
+                klass_model.syncing_objects.filter(id=self.id).delete()
             return None, deferred_fks
         else:
             # load model into memory
@@ -806,6 +806,11 @@ class SyncableModel(UUIDModelMixin):
 
     objects = SyncableModelManager()
 
+    # Add a special syncing_objects queryset to every SyncableModel for use in syncing operations.
+    # This means that we still deal with the entire set of objects when syncing, even if the default
+    # model manager has been overridden to filter the queryset.
+    syncing_objects = SyncableModelManager()
+
     class Meta:
         abstract = True
 

{morango-0.8.3 → morango-0.8.4}/morango/registry.py

@@ -35,6 +35,24 @@ def _multiple_self_ref_fk_check(class_model):
     return False
 
 
+def _check_manager(name, objects):
+    from morango.models.manager import SyncableModelManager
+    from morango.models.query import SyncableModelQuerySet
+    # syncable model checks
+    if not isinstance(objects, SyncableModelManager):
+        raise InvalidMorangoModelConfiguration(
+            "Manager for {} must inherit from SyncableModelManager.".format(
+                name
+            )
+        )
+    if not isinstance(objects.none(), SyncableModelQuerySet):
+        raise InvalidMorangoModelConfiguration(
+            "Queryset for {} model must inherit from SyncableModelQuerySet.".format(
+                name
+            )
+        )
+
+
 class SyncableModelRegistry(object):
     def __init__(self):
         self.profile_models = {}
@@ -98,8 +116,6 @@ class SyncableModelRegistry(object):
 
         import django.apps
         from morango.models.core import SyncableModel
-        from morango.models.manager import SyncableModelManager
-        from morango.models.query import SyncableModelQuerySet
 
         model_list = []
         for model in django.apps.apps.get_models():
@@ -110,19 +126,10 @@ class SyncableModelRegistry(object):
                     raise InvalidMorangoModelConfiguration(
                         "Syncing models with more than 1 self referential ForeignKey is not supported."
                     )
-                # syncable model checks
-                if not isinstance(model.objects, SyncableModelManager):
-                    raise InvalidMorangoModelConfiguration(
-                        "Manager for {} must inherit from SyncableModelManager.".format(
-                            name
-                        )
-                    )
-                if not isinstance(model.objects.none(), SyncableModelQuerySet):
-                    raise InvalidMorangoModelConfiguration(
-                        "Queryset for {} model must inherit from SyncableModelQuerySet.".format(
-                            name
-                        )
-                    )
+                # Check both the objects and the syncing_objects querysets.
+                _check_manager(name, model.objects)
+                _check_manager(name, model.syncing_objects)
+
                 if model._meta.many_to_many:
                     raise UnsupportedFieldType(
                         "{} model with a ManyToManyField is not supported in morango."

{morango-0.8.3 → morango-0.8.4}/morango/sync/operations.py

@@ -145,7 +145,7 @@ def _serialize_into_store(profile, filter=None):
         for model in syncable_models.get_models(profile):
             new_store_records = []
             new_rmc_records = []
-            klass_queryset = model.objects.filter(_morango_dirty_bit=True)
+            klass_queryset = model.syncing_objects.filter(_morango_dirty_bit=True)
             if prefix_condition:
                 klass_queryset = klass_queryset.filter(prefix_condition)
             store_records_dict = Store.objects.in_bulk(

{morango-0.8.3 → morango-0.8.4}/morango.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morango
-Version: 0.8.3
+Version: 0.8.4
 Summary: Pure Python sqlite-based Django DB replication engine.
 Home-page: https://github.com/learningequality/morango
 Author: Learning Equality

morango-0.8.4/requirements/dev.txt

@@ -0,0 +1,2 @@
+pre-commit==4.1.0
+tox==3.14.6

morango-0.8.3/morango/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.8.3"

morango-0.8.3/requirements/dev.txt

@@ -1,3 +0,0 @@
-flake8==2.6.0
-pre-commit==1.15.1
-tox==3.14.6