[MIG] server_environment: migration to 15.0

server_environment/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "server configuration environment files",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "depends": ["base", "base_sparse_field"],
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "summary": "move some configurations out of the database",

server_environment/models/server_env_mixin.py

@@ -393,3 +393,4 @@ class ServerEnvMixin(models.AbstractModel):
             self._server_env_add_default_field(field)
             self._server_env_transform_field_to_read_from_env(field)
             self._server_env_add_is_editable_field(field)
+        return

server_environment/server_env.py

@@ -111,7 +111,9 @@ def _load_config_from_server_env_files(config_p):
     try:
         config_p.read(conf_files)
     except Exception as e:
-        raise Exception('Cannot read config files "{}":  {}'.format(conf_files, e))
+        raise Exception(
+            'Cannot read config files "{}":  {}'.format(conf_files, e)
+        ) from e
 
 
 def _load_config_from_rcfile(config_p):
@@ -128,7 +130,7 @@ def _load_config_from_env(config_p):
             except configparser.Error as err:
                 raise Exception(
                     "{} content could not be parsed: {}".format(varname, err)
-                )
+                ) from err
 
 
 def _load_config():
@@ -213,7 +215,7 @@ class ServerConfiguration(models.TransientModel):
 
     @classmethod
     def _get_base_cols(cls):
-        """ Compute base fields"""
+        """Compute base fields"""
         res = {}
         for col, item in list(system_base_config.options.items()):
             key = cls._format_key("odoo", col)
@@ -222,7 +224,7 @@ class ServerConfiguration(models.TransientModel):
 
     @classmethod
     def _get_env_cols(cls, sections=None):
-        """ Compute base fields"""
+        """Compute base fields"""
         res = {}
         sections = sections if sections else serv_config.sections()
         for section in sections:
@@ -233,7 +235,7 @@ class ServerConfiguration(models.TransientModel):
 
     @classmethod
     def _get_system_cols(cls):
-        """ Compute system fields"""
+        """Compute system fields"""
         res = {}
         for col, item in get_server_environment():
             key = cls._format_key("system", col)
@@ -316,6 +318,8 @@ class ServerConfiguration(models.TransientModel):
         ):
             return res
         for key in self._conf_defaults:
+            if key not in fields_list:
+                continue
             if not self.show_passwords and self._is_secret(key=key):
                 res[key] = "**********"
             else:

server_environment/tests/common.py

@@ -11,7 +11,7 @@ import odoo.addons.server_environment.models.server_env_mixin as server_env_mixi
 from odoo.addons.server_environment import server_env
 
 
-class ServerEnvironmentCase(common.SavepointCase):
+class ServerEnvironmentCase(common.TransactionCase):
     @contextmanager
     def set_config_dir(self, path):
         original_dir = server_env._dir

server_environment/tests/test_server_environment.py

@@ -18,7 +18,9 @@ class TestEnv(common.ServerEnvironmentCase):
     def _test_default(self, hidden_pwd=False):
         model = self.env["server.config"]
         rec = model.create({})
-        defaults = rec.default_get([])
+        fields = model.fields_view_get()["fields"]
+        self.assertTrue(fields)
+        defaults = rec.default_get(list(fields))
         self.assertTrue(defaults)
         self.assertIsInstance(defaults, dict)
         pass_checked = False

setup/server_environment/odoo/addons/server_environment

@@ -0,0 +1 @@
+../../../../server_environment

setup/server_environment/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)