morango 0.8.2__tar.gz → 0.8.3__tar.gz

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

@@ -2,6 +2,10 @@
 
 List of the most important changes for each release.
 
+## 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
+
 ## 0.8.2
 - Adds support for Python 3.13
 - Adds conditional index to improve deserialization queries

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

@@ -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

morango-0.8.3/morango/__init__.py

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

{morango-0.8.2 → morango-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 → morango-0.8.3}/morango.egg-info/PKG-INFO

@@ -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

{morango-0.8.2 → morango-0.8.3}/morango.egg-info/requires.txt

@@ -1,6 +1,6 @@
 django<4,>=3
 django-mptt>0.10.0
-rsa<3.5,>=3.4.2
+rsa<4.10
 djangorestframework>3.10
 django-ipware==4.0.2
 requests

{morango-0.8.2 → morango-0.8.3}/setup.py

@@ -25,7 +25,7 @@ setup(
     install_requires=[
         "django>=3,<4",
         "django-mptt>0.10.0",
-        "rsa>=3.4.2,<3.5",
+        "rsa<4.10",
         "djangorestframework>3.10",
         "django-ipware==4.0.2",
         "requests",

morango-0.8.2/morango/__init__.py

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