morango 0.8.2__py2.py3-none-any.whl → 0.8.4__py2.py3-none-any.whl

morango/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.2"
+__version__ = "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/models/fields/crypto.py

@@ -6,6 +6,7 @@ desirability/efficiency from left to right). We have a base ``Key`` class which
 """
 import hashlib
 import re
+import sys
 
 import rsa as PYRSA
 from django.db import models
@@ -20,6 +21,16 @@ except ImportError:
     M2CRYPTO_EXISTS = False
 
 try:
+    # Pre-empt the PanicException that importing cryptography can cause
+    # when we are using a non-compatible version of cffi on Python 3.13
+    # this happens because of static depdendency bundling in Kolibri
+    import cffi
+
+    if sys.version_info > (3, 13):
+        if hasattr(cffi, "__version_info__"):
+            if cffi.__version_info__ < (1, 17, 1):
+                raise ImportError
+
     from cryptography.hazmat.backends import default_backend
     from cryptography import exceptions as crypto_exceptions
 
@@ -39,7 +50,13 @@ try:
     CRYPTOGRAPHY_EXISTS = True
 except ImportError:
     CRYPTOGRAPHY_EXISTS = False
-
+except BaseException as e:
+    # Still catch PanicExceptions just in case.
+    if "Python API call failed" in str(e):
+        CRYPTOGRAPHY_EXISTS = False
+    else:
+        # Otherwise raise the error again to avoid silently catching other errors
+        raise
 
 from base64 import encodebytes as b64encode, decodebytes as b64decode
 

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/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.2.dist-info → morango-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morango
-Version: 0.8.2
+Version: 0.8.4
 Summary: Pure Python sqlite-based Django DB replication engine.
 Home-page: https://github.com/learningequality/morango
 Author: Learning Equality
@@ -26,7 +26,7 @@ License-File: LICENSE
 License-File: AUTHORS.md
 Requires-Dist: django<4,>=3
 Requires-Dist: django-mptt>0.10.0
-Requires-Dist: rsa<3.5,>=3.4.2
+Requires-Dist: rsa<4.10
 Requires-Dist: djangorestframework>3.10
 Requires-Dist: django-ipware==4.0.2
 Requires-Dist: requests

{morango-0.8.2.dist-info → morango-0.8.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-morango/__init__.py,sha256=B7GiO0rd49YwtLYjvPg4lmCZEDlMTonslQKdSImaMJk,22
+morango/__init__.py,sha256=jhHEJFZWhkQDemoZMomBYq-RNrKXknYzUaeIU9A6XsI,22
 morango/apps.py,sha256=bs_LaTt1038Oh0OOWqaZKpF8rL9cg8rqW4hftIILPw8,559
 morango/errors.py,sha256=okjt7FqSHIf3x9SmnmoW6aqNJ_g7Ye3Fx7tuQSNUYEI,1223
 morango/proquint.py,sha256=YRjgceaYD_wDE8R-21AK5m6MSzbarIBP_kDxJ_gHsbQ,3679
-morango/registry.py,sha256=uaB2qdVMiWps_eB7F1r43qf_5rteUvgRb6fcEYdCt2Y,9430
+morango/registry.py,sha256=LcHyrNqcqSBAEHJDMS0pinKKzkxRTZjxEyAeZhtrKgo,9480
 morango/urls.py,sha256=pIjnq01BUNxnC0BucRXMr_0H366U5l88k65r67JtHK8,131
 morango/utils.py,sha256=psppzkIjlrmWI2bq2a1wGW0f_0VhdszYleLbm4C4aAs,3652
 morango/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -50,19 +50,19 @@ morango/migrations/0024_auto_20240129_1757.py,sha256=Buy1T4PiTFo8zP7p2HY-3gmiJur
 morango/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 morango/models/__init__.py,sha256=ws6VwRPs7iKLRfFSuRpUESTZlGEmSk0Nv61chh-Gn2Q,1722
 morango/models/certificates.py,sha256=XVq6tKOwLZjq2hw0j5hrBQGsm5H-GSPZ5ZVOg9An9Hw,15110
-morango/models/core.py,sha256=S7hfI8Bo60qvVr2Pr_VRnFUpSqAtV-WvBUDlk0dtWEE,38762
+morango/models/core.py,sha256=-yZ01bS0nXNV0BL_wTHEc4x-7Hh_69hn3MyUunGK2SU,39080
 morango/models/fsic_utils.py,sha256=B9RM-uPZFvEXWbsPeeit5qA21gKGpA0NkKCLFIdNI_0,7130
 morango/models/manager.py,sha256=fzzX7k8qV5W5dMBb0ASOBNRJRpvQZbEG1hgyuMtzt4g,163
 morango/models/query.py,sha256=eHcf9PYYEDShN6lRng7Ow9RJwNFPdKI1hDbVUXeyl9U,869
 morango/models/signals.py,sha256=R17Fqddbg2AgAVnH4oZPrDQMWi94R2XsLmnUbrgKS2I,478
 morango/models/utils.py,sha256=8J138TR3FkslovfUWkLLEpODieFtmHKne7Lm1I8iPXk,6588
 morango/models/fields/__init__.py,sha256=dzxg8-_v3irXkPnyCsiVDur0gG0RJfKzFcshjL6Y-9s,225
-morango/models/fields/crypto.py,sha256=Uyjqyt63ztwdaJ7-bftnu8TytSYqAdzFhzVKVeeP5a4,13842
+morango/models/fields/crypto.py,sha256=Q_y7s-UpFEz9zXFaAkEDOmqwx4b19F7wbTafpd_XPp4,14509
 morango/models/fields/uuids.py,sha256=w7M8KlA8oLPascq14tcor89V92IGxx2XtdweS-0lF6A,4275
 morango/sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 morango/sync/context.py,sha256=_gqfE-RfTIn0UMKFeI2snIJEGCbmR_NRl-Ts5u35B7Q,17815
 morango/sync/controller.py,sha256=rcibQcq579hneUef2p41Ze4OCysLI7rVz6FCFIfYiVA,11575
-morango/sync/operations.py,sha256=jDIHPF8IdqoUOer3aaoq9VHcL0-BVeS7-wlMxMHA1-w,69494
+morango/sync/operations.py,sha256=ErZ-W4MiCUVl_vn0pFi8DWGgT1C9wOAH4AagCMdLBOs,69502
 morango/sync/session.py,sha256=9CTLhpEPM8q1M_b2HHxouZbzm7vBJoImoqPWqdodgII,3853
 morango/sync/syncsession.py,sha256=82TzwxNOH4QSR41mbRWAHWlZOAF_XxaWIRk6EXIWj1o,25292
 morango/sync/utils.py,sha256=BrG8CYVmaAhRNa_HYuPCYSnncskSsW_ig0Cf7xsY2mo,8792
@@ -71,9 +71,9 @@ morango/sync/backends/base.py,sha256=zQP5hOB2Qw0qv0G00LXFHl2GQ3b0bheyujdNVl5rT-8
 morango/sync/backends/postgres.py,sha256=N0IeXN67AkdQKlD20b8LQZ1ocdarapL8pqu8FQAc6lM,19850
 morango/sync/backends/sqlite.py,sha256=vg7kWFIF346-NjVwexYfjYbrrOyzzvcCmk5uUkqhabw,12850
 morango/sync/backends/utils.py,sha256=UvyYByzRenOwtDvLPO_1wIOE8Yr88FnuAM2c4VSk7uQ,5145
-morango-0.8.2.dist-info/AUTHORS.md,sha256=9Ussd3Fq3RPjHyQT_3AyGss5jiVbn858WQuIBOi1ajI,276
-morango-0.8.2.dist-info/LICENSE,sha256=RkI6MjmrrTKa3aoPAVyk9QdeLZclcrKds6FH3phRSRU,1074
-morango-0.8.2.dist-info/METADATA,sha256=4Wl0oDOYp832UVBsT_2WfEeh6eN9B7tNcD1QlzSUwUk,2592
-morango-0.8.2.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-morango-0.8.2.dist-info/top_level.txt,sha256=pzREWN0EeEq3yHDRast9XI081Ow_rtcm7WV0ZQTlIPY,8
-morango-0.8.2.dist-info/RECORD,,
+morango-0.8.4.dist-info/AUTHORS.md,sha256=9Ussd3Fq3RPjHyQT_3AyGss5jiVbn858WQuIBOi1ajI,276
+morango-0.8.4.dist-info/LICENSE,sha256=RkI6MjmrrTKa3aoPAVyk9QdeLZclcrKds6FH3phRSRU,1074
+morango-0.8.4.dist-info/METADATA,sha256=gdnV3KotcdrkSTIoAX8GVij3As1tpxaDYzf0Cg1lALU,2585
+morango-0.8.4.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+morango-0.8.4.dist-info/top_level.txt,sha256=pzREWN0EeEq3yHDRast9XI081Ow_rtcm7WV0ZQTlIPY,8
+morango-0.8.4.dist-info/RECORD,,

{morango-0.8.2.dist-info → morango-0.8.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any