flextool 4.0.1__tar.gz → 4.0.2__tar.gz

{flextool-4.0.1 → flextool-4.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flextool
-Version: 4.0.1
+Version: 4.0.2
 Summary: IRENA FlexTool is an energy and power systems model for understanding the role of variable power generation in future energy systems.
 Author: IRENA FlexTool contributors
 License: © International Renewable Energy Agency 2018-2022

{flextool-4.0.1 → flextool-4.0.2}/flextool/update_flextool/self_update.py

@@ -269,7 +269,7 @@ def ensure_runtime_files(verbose: bool = False) -> None:
 
     # 5. results.sqlite (and its template), both create-if-missing.
     try:
-        result_template_path = str(package_data_path("schemas/pre_v26/flextool_template_results_master.json"))
+        result_template_path = str(package_data_path("schemas/spinedb_results_schema.json"))
         if not os.path.exists("templates/results_template.sqlite"):
             initialize_result_database("templates/results_template.sqlite", result_template_path)
         if not os.path.exists("results.sqlite") and os.path.exists("templates/results_template.sqlite"):
@@ -379,7 +379,7 @@ def update_flextool(skip_git):
     # Refresh the results template (unconditional) and ensure results.sqlite
     # exists (ensure_runtime_files seeds it; this is a belt-and-braces copy
     # for the case it was removed since).
-    result_template_path = str(package_data_path("schemas/pre_v26/flextool_template_results_master.json"))
+    result_template_path = str(package_data_path("schemas/spinedb_results_schema.json"))
     if os.path.exists('templates/results_template.sqlite'):
         os.remove('templates/results_template.sqlite')
     initialize_result_database('templates/results_template.sqlite', result_template_path)
@@ -392,8 +392,7 @@ def update_flextool(skip_git):
         template = json.load(json_file)
     with DatabaseMapping('sqlite:///' + 'results.sqlite', create = False, upgrade = True) as db:
         #these update the old descriptions, but wont remove them or change names (the new name is created, but old stays)
-        (num,log) = import_data(db, object_parameters = template["object_parameters"])
-        (num,log) = import_data(db, relationship_parameters = template["relationship_parameters"])
+        (num,log) = import_data(db, parameter_definitions = template["parameter_definitions"])
         try:
             db.commit_session("Updated relationship_parameters, object parameters to the Results.sqlite")
         except NothingToCommit:

{flextool-4.0.1 → flextool-4.0.2}/flextool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flextool
-Version: 4.0.1
+Version: 4.0.2
 Summary: IRENA FlexTool is an energy and power systems model for understanding the role of variable power generation in future energy systems.
 Author: IRENA FlexTool contributors
 License: © International Renewable Energy Agency 2018-2022

{flextool-4.0.1 → flextool-4.0.2}/pyproject.toml

@@ -3,7 +3,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flextool"
-version = "4.0.1"
+version = "4.0.2"
 description = "IRENA FlexTool is an energy and power systems model for understanding the role of variable power generation in future energy systems."
 readme = "README.md"
 license = { file = "LICENSE.txt" }