Merge PR #3195 into 16.0

Signed-off-by pedrobaeza
OCA · Feb 12, 2025 · 60e1e8b · 60e1e8b
2 parents 846d0bc + 29b1ac7
commit 60e1e8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base_remote/models/base.py b/base_remote/models/base.py
@@ -13,6 +13,6 @@ class Base(models.AbstractModel):
     def remote(self):
         try:
             remote_addr = http.request.httprequest.remote_addr
-        except (KeyError, AttributeError):
+        except (KeyError, AttributeError, RuntimeError):
             return self.env["res.remote"]
         return self.env["res.remote"]._get_remote(remote_addr)
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,2 +1,4 @@
+cryptography==3.4.8; python_version < '3.12'  # incompatibility between pyopenssl 19.0.0 and cryptography>=37.0.0
+cryptography==42.0.8 ; python_version >= '3.12'  # (Noble) min 41.0.7, pinning 42.0.8 for security fixes
 odoo_test_helper
 mock