Skip to content

Commit

Permalink
Merge PR #3200 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by etobella
  • Loading branch information
OCA-git-bot committed Feb 15, 2025
2 parents 6ac1263 + 300984c commit e4b0389
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion base_import_odoo/tests/test_base_import_odoo.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2017-2018 Therp BV <http://therp.nl>
# Copyright 2020 Hunki Enterprises BV <https://hunki-enterprises.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from mock import patch
from unittest.mock import patch

from odoo.tests.common import TransactionCase, tagged

Expand Down
1 change: 0 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
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

0 comments on commit e4b0389

Please sign in to comment.