prophecy-libs 2.0.9.dev0__tar.gz → 2.0.9.dev2__tar.gz

{prophecy-libs-2.0.9.dev0 → prophecy-libs-2.0.9.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: prophecy-libs
-Version: 2.0.9.dev0
+Version: 2.0.9.dev2
 Summary: Helper library for prophecy generated code
 Home-page: https://github.com/SimpleDataLabsInc/prophecy-python-libs
 Author: UNKNOWN

{prophecy-libs-2.0.9.dev0 → prophecy-libs-2.0.9.dev2}/prophecy/config/config_base.py

@@ -36,10 +36,13 @@ class ProjectConfig:
     def get_resolved_project_config_values(project_config_values, overridden_values):
         merged_values = ProjectConfig.get_merged_values(project_config_values, overridden_values)
         # Override with pipeline config values for fields that are present in config_values
+        keys_to_delete = []
         for field_name, field_value in merged_values.items():
             if field_name not in project_config_values:
                 # Delete those fields which are not in project config
-                del merged_values[field_name]
+                keys_to_delete.append(field_name)
+        for key in keys_to_delete:
+            del merged_values[key]
         return merged_values
 
     def __init__(self, config_schema: ConfigurationRecord, config_values: dict):

{prophecy-libs-2.0.9.dev0 → prophecy-libs-2.0.9.dev2}/prophecy/config/utils.py

@@ -75,10 +75,6 @@ def get_resource_file_content(resource_file_name, config_package):
 # 1 arg parse_config() for backward compatibility.
 def parse_config(args, pipeline_dot_conf=None, config_package=None):
     config_package = "prophecy_config_instances" if config_package is None else config_package
-    if args.projectConfInstance is not None:
-        resource_file_name = f"{args.confInstance}.json"
-        project_instance_file_content = get_resource_file_content(resource_file_name, config_package)
-        project_instance_conf_tree = ConfigFactory.parse_string(project_instance_file_content)
     if args.file is not None:
         if hasattr(args, "defaultConfFile"):
             default_config = ConfigFactory.parse_file(
@@ -106,8 +102,6 @@ def parse_config(args, pipeline_dot_conf=None, config_package=None):
                 conf = ConfigFactory.parse_string(data)
     else:
         conf = ConfigFactory.parse_string("{}")
-    # Merge pipeline file configs with project configs here. Give less priority to project config here.
-    conf = conf
     if args.overrideJson is not None:
         # Override fields
         conf = ConfigTree.merge_configs(conf, ConfigFactory.parse_string(args.overrideJson))

{prophecy-libs-2.0.9.dev0 → prophecy-libs-2.0.9.dev2}/prophecy_libs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: prophecy-libs
-Version: 2.0.9.dev0
+Version: 2.0.9.dev2
 Summary: Helper library for prophecy generated code
 Home-page: https://github.com/SimpleDataLabsInc/prophecy-python-libs
 Author: UNKNOWN

{prophecy-libs-2.0.9.dev0 → prophecy-libs-2.0.9.dev2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="prophecy-libs",
-    version="2.0.9.dev0",
+    version="2.0.9.dev2",
     url="https://github.com/SimpleDataLabsInc/prophecy-python-libs",
     packages=find_packages(exclude=["test.*", "test"]),
     package_data={