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

morango/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.2"
+__version__ = "0.8.3"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morango
-Version: 0.8.2
+Version: 0.8.3
 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.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-morango/__init__.py,sha256=B7GiO0rd49YwtLYjvPg4lmCZEDlMTonslQKdSImaMJk,22
+morango/__init__.py,sha256=otnwfmvJLUamPajTPUaIekiO9mA-2HPi-_h_E0N-uOQ,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
@@ -57,7 +57,7 @@ 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
@@ -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.3.dist-info/AUTHORS.md,sha256=9Ussd3Fq3RPjHyQT_3AyGss5jiVbn858WQuIBOi1ajI,276
+morango-0.8.3.dist-info/LICENSE,sha256=RkI6MjmrrTKa3aoPAVyk9QdeLZclcrKds6FH3phRSRU,1074
+morango-0.8.3.dist-info/METADATA,sha256=JOARsLSzdnUDHtk5_0NDG4W-PSkiVHylM2EpzRdaIn8,2585
+morango-0.8.3.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+morango-0.8.3.dist-info/top_level.txt,sha256=pzREWN0EeEq3yHDRast9XI081Ow_rtcm7WV0ZQTlIPY,8
+morango-0.8.3.dist-info/RECORD,,

{morango-0.8.2.dist-info → morango-0.8.3.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