resolved inf conflicts

franciscojavierarceo · franciscojavierarceo · commit c6d55c7f913e · 2024-10-05T11:58:25.000-04:00
Signed-off-by: Francisco Javier Arceo &lt;farceo@redhat.com&gt;
diff --git a/sdk/python/feast/feature_store.py b/sdk/python/feast/feature_store.py
@@ -608,12 +608,19 @@ def _make_inferences(
         update_feature_views_with_inferred_features_and_entities(
             sfvs_to_update, entities + entities_to_update, self.config
         )
+<<<<<<< HEAD
         # We need to attach the time stamp fields to the underlying data sources
         # and cascade the dependencies
         update_feature_views_with_inferred_features_and_entities(
             odfvs_to_update, entities + entities_to_update, self.config
         )
         # TODO(kevjumba): Update schema inference
+=======
+        update_feature_views_with_inferred_features_and_entities(
+            odfvs_to_update, entities + entities_to_update, self.config
+        )
+        # TODO(kevjumba): Update schema inferrence
+>>>>>>> 569884db8 (cleaned up test)
         for sfv in sfvs_to_update:
             if not sfv.schema:
                 raise ValueError(
diff --git a/sdk/python/feast/inference.py b/sdk/python/feast/inference.py
@@ -13,9 +13,9 @@
 from feast.infra.offline_stores.file_source import FileSource
 from feast.infra.offline_stores.redshift_source import RedshiftSource
 from feast.infra.offline_stores.snowflake_source import SnowflakeSource
-from feast.on_demand_feature_view import OnDemandFeatureView
 from feast.repo_config import RepoConfig
 from feast.stream_feature_view import StreamFeatureView
+from feast.on_demand_feature_view import OnDemandFeatureView
 from feast.types import String
 from feast.value_type import ValueType
 
diff --git a/sdk/python/tests/unit/test_on_demand_python_transformation.py b/sdk/python/tests/unit/test_on_demand_python_transformation.py
@@ -28,7 +28,6 @@
     Float64,
     Int64,
     String,
-    UnixTimestamp,
     ValueType,
     _utc_now,
     from_value_type,
