Merge pull request #150 from acsone/odoo18-ci

Test with Odoo 18
acsone · Oct 23, 2024 · 49d80f2 · 49d80f2
2 parents 72d2dae + 37d0827
commit 49d80f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,9 @@ jobs:
           - python-version: "3.12"
             toxenv: "py312-17.0"
             machine: ubuntu-22.04
+          - python-version: "3.12"
+            toxenv: "py312-18.0"
+            machine: ubuntu-24.04
           - python-version: "3.10"
             toxenv: "twine_check"
             machine: ubuntu-22.04

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -11,7 +11,7 @@
 # This hack is necessary because the way CliRunner patches
 # stdout is not compatible with the Odoo logging initialization
 # mechanism. Logging is therefore tested with subprocesses.
-odoo.netsvc._logger_init = True
+odoo.netsvc.init_logger = lambda: None
 
 
 def _init_odoo_db(dbname, test_addons_dir=None):

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 envlist =
-  py312-{16.0,17.0}
+  py312-{16.0,17.0,18.0}
   py311-{16.0,17.0}
   py310-{16.0,17.0}
   py38-{15.0}
@@ -23,6 +23,7 @@ commands =
   15.0: {toxinidir}/tests/scripts/install_odoo.py 15.0 {envdir}/src/odoo
   16.0: {toxinidir}/tests/scripts/install_odoo.py 16.0 {envdir}/src/odoo
   17.0: {toxinidir}/tests/scripts/install_odoo.py 17.0 {envdir}/src/odoo
+  18.0: {toxinidir}/tests/scripts/install_odoo.py 18.0 {envdir}/src/odoo
   pytest --verbose --cov=click_odoo_contrib --cov-branch --cov-report=html --cov-report=term --cov-report=xml {posargs}
 deps =
   pytest