[ADD][14.0] Support for --upgrade-path and apriori.json

openupgradelib/openupgrade.py

@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import json
 import sys
 import os
 import inspect
@@ -58,6 +59,7 @@ def __exit__(self, exc_type, exc_value, traceback):
 from psycopg2.extensions import AsIs
 from lxml import etree
 from . import openupgrade_tools
+from .apriori import Apriori
 
 core = None
 # The order matters here. We can import odoo in 9.0, but then we get odoo.py
@@ -269,7 +271,7 @@ def load_data(cr, module_name, filename, idref=None, mode='init'):
 
     :param module_name: the name of the module
     :param filename: the path to the filename, relative to the module \
-    directory.
+    directory. This may also be the module directory relative to --upgrade-path
     :param idref: optional hash with ?id mapping cache?
     :param mode:
         one of 'init', 'update', 'demo', 'init_no_create'.
@@ -288,7 +290,15 @@ def load_data(cr, module_name, filename, idref=None, mode='init'):
     logger.info('%s: loading %s' % (module_name, filename))
     _, ext = os.path.splitext(filename)
     pathname = os.path.join(module_name, filename)
-    fp = tools.file_open(pathname)
+
+    try:
+        fp = tools.file_open(pathname)
+    except OSError:
+        if tools.config.get('upgrade_path'):
+            pathname = os.path.join(
+                tools.config['upgrade_path'], module_name, filename)
+        fp = open(pathname)
+
     try:
         if ext == '.csv':
             noupdate = True
@@ -2558,3 +2568,22 @@ def convert_to_company_dependent(
                 )
             ), args,
         )
+
+
+def _load_apriori(path=None):
+    """ Load a 14.0+ Apriori object from apriori.json in the root of the
+    --upgrade-path """
+    if path is None:
+        from odoo import tools
+        path = tools.config['upgrade_path']
+        apriori_path = os.path.join(path, "apriori.json")
+    try:
+        with open(apriori_path) as json_file:
+            apriori_dict = json.load(json_file)
+    except FileNotFoundError:
+        raise UserError(
+            "Could not import apriori.json: file %s not found" % apriori_path
+        )
+    except ValueError:
+        raise UserError("The contents of apriori.json is not valid json")
+    return Apriori(apriori_dict)