Compat with Odoo 19.0

Author: fkantelberg

src/doblib/env.py

@@ -236,8 +236,20 @@ def _init_odoo(self):
             sys.path.append(path)
 
         self._link_modules()
+
+        # Initialize Odoo
+        import odoo
+
+        if self.odoo_version() >= (19,):
+            import odoo.init
+
         return path
 
+    def odoo_version(self):
+        import odoo.release
+
+        return odoo.release.version_info
+
     @contextmanager
     def env(self, db_name, rollback=False):
         """Create an environment from a registry"""

src/doblib/module.py

@@ -93,7 +93,6 @@ def install_all(self, db_name, modules):
         """Install all modules"""
         # pylint: disable=C0415,E0401
         import odoo
-        import odoo.release
         from odoo.modules.registry import Registry
         from odoo.tools import config
 
@@ -108,8 +107,10 @@ def install_all(self, db_name, modules):
             config["load_language"] = languages
 
         kwargs = {"update_module": True}
-        if odoo.release.version_info < (19,):
+        if self.odoo_version() < (19,):
             kwargs["force_demo"] = not without_demo
+        else:
+            kwargs["install_modules"] = list(modules)
 
         Registry.new(db_name, **kwargs)
 
@@ -186,9 +187,14 @@ def update_specific(
             modules.difference_update(blacklist or [])
 
         config["init"] = {}
-        config["update"] = dict.fromkeys(modules, 1)
         config["overwrite_existing_translations"] = True
-        Registry.new(db_name, update_module=True)
+        kwargs = {"update_module": True}
+        if self.odoo_version() < (19,):
+            config["update"] = dict.fromkeys(modules, 1)
+        else:
+            kwargs["upgrade_modules"] = list(modules)
+
+        Registry.new(db_name, **kwargs)
 
     def update_changed(self, db_name, blacklist=None):
         """Update only changed modules"""
@@ -257,6 +263,9 @@ def update(self, args=None):
             else:
                 installed = self._get_installed_modules(db_name)
                 modules = self._get_modules()
+                if args.modules:
+                    modules.update(args.modules)
+
                 uninstalled = modules.difference(installed)
 
             # Install all modules

tests/test_module.py

@@ -7,7 +7,6 @@
 from unittest import mock
 
 import pytest
-
 from doblib import base
 from doblib.module import ModuleEnvironment, no_flags
 
@@ -21,6 +20,22 @@ def env():
     return env
 
 
+def mock_odoo_import():
+    odoo = sys.modules["odoo"] = mock.MagicMock()
+    sys.modules["odoo.tools"] = odoo.tools
+    sys.modules["odoo.release"] = odoo.release = mock.MagicMock(version_info=(18,))
+    sys.modules["odoo.api"] = odoo.api
+    sys.modules["odoo.cli"] = odoo.cli
+    sys.modules["odoo.cli.server"] = odoo.cli.server
+    sys.modules["odoo.tools"] = odoo.tools
+    sys.modules["odoo.modules"] = odoo.modules
+    sys.modules["odoo.modules.db"] = odoo.modules.db
+    sys.modules["odoo.modules.registry"] = odoo.modules.registry
+    sys.modules["odoo.release"] = odoo.release
+    sys.modules["odoo.sql_db"] = odoo.sql_db
+    return odoo
+
+
 def test_run_migration(env):
     cur = os.getcwd()
     os.chdir("tests/environment/")
@@ -85,11 +100,7 @@ def test_get_installed_modules(env):
 
 
 def test_install_all(env):
-    odoo = sys.modules["odoo"] = mock.MagicMock()
-    sys.modules["odoo.release"] = odoo.release = mock.MagicMock(version_info=(18,))
-    sys.modules["odoo.tools"] = odoo.tools
-    sys.modules["odoo.modules"] = odoo.modules
-    sys.modules["odoo.modules.registry"] = odoo.modules.registry
+    odoo = mock_odoo_import()
 
     env.install_all("odoo", ["module"])
     odoo.modules.registry.Registry.new.assert_called_once_with(
@@ -103,10 +114,7 @@ def test_install_all(env):
 
 
 def test_update_all(env):
-    odoo = sys.modules["odoo"] = mock.MagicMock()
-    sys.modules["odoo.tools"] = odoo.tools
-    sys.modules["odoo.modules"] = odoo.modules
-    sys.modules["odoo.modules.registry"] = odoo.modules.registry
+    odoo = mock_odoo_import()
 
     env.update_specific("odoo", installed=True)
     odoo.modules.registry.Registry.new.assert_called_once_with(
@@ -116,10 +124,7 @@ def test_update_all(env):
 
 
 def test_update_listed(env):
-    odoo = sys.modules["odoo"] = mock.MagicMock()
-    sys.modules["odoo.tools"] = odoo.tools
-    sys.modules["odoo.modules"] = odoo.modules
-    sys.modules["odoo.modules.registry"] = odoo.modules.registry
+    odoo = mock_odoo_import()
     env._get_modules = mock.MagicMock()
 
     env.update_specific("odoo", listed=True)
@@ -149,17 +154,9 @@ def test_update_changed(env):
 
 def test_update(env):
     # Quite complex and we have to mock plenty of stuff
-    odoo = sys.modules["odoo"] = mock.MagicMock()
-    tools = sys.modules["odoo.tools"] = odoo.tools
-    sys.modules["odoo.api"] = odoo.api
-    sys.modules["odoo.cli"] = odoo.cli
-    sys.modules["odoo.cli.server"] = odoo.cli.server
-    sys.modules["odoo.tools"] = odoo.tools
-    sys.modules["odoo.modules"] = odoo.modules
-    sys.modules["odoo.modules.db"] = odoo.modules.db
-    sys.modules["odoo.modules.registry"] = odoo.modules.registry
-    sys.modules["odoo.release"] = odoo.release
-    sys.modules["odoo.sql_db"] = odoo.sql_db
+    odoo = mock_odoo_import()
+    tools = odoo.tools
+
     tools.config.__getitem__.return_value = "odoo"
     odoo.release.version_info = (14, 0)
     env.generate_config = mock.MagicMock()
@@ -196,7 +193,7 @@ def test_update(env):
     env.update_specific.assert_called_once_with(
         "odoo",
         whitelist=["abc", "def"],
-        blacklist={"normal"},
+        blacklist={"abc", "def", "normal"},
         installed=False,
         listed=False,
     )