Skip to content

Commit e4b0389

Browse files
committed
Merge PR OCA#3200 into 16.0
Signed-off-by etobella
2 parents 6ac1263 + 300984c commit e4b0389

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

base_import_odoo/tests/test_base_import_odoo.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2017-2018 Therp BV <http://therp.nl>
22
# Copyright 2020 Hunki Enterprises BV <https://hunki-enterprises.com>
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
4-
from mock import patch
4+
from unittest.mock import patch
55

66
from odoo.tests.common import TransactionCase, tagged
77

test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
cryptography==3.4.8; python_version < '3.12' # incompatibility between pyopenssl 19.0.0 and cryptography>=37.0.0
22
cryptography==42.0.8 ; python_version >= '3.12' # (Noble) min 41.0.7, pinning 42.0.8 for security fixes
33
odoo_test_helper
4-
mock

0 commit comments

Comments
 (0)