revert merge changes

Signed-off-by: Danny Chiao <danny@tecton.ai>
feast-dev · feast-ci-bot · Aug 10, 2022 · Jul 24, 2022 · Jul 31, 2022 · Aug 7, 2022
commit 228555c40ba9b93c294b077bd7693a5b6dda5499
diff --git a/Makefile b/Makefile
@@ -146,7 +146,7 @@ test-python-universal-athena:
  	FEAST_USAGE=False IS_TEST=True \
 	S3_DATABASE=sampledb \
 	S3_BUCKET_NAME=sagemaker-yelo-test \
- 	python -m pytest -n 1 --integration \
+ 	python -m pytest -n 8 --integration \
  	 	-k "not test_go_feature_server and \
 		    not test_logged_features_validation and \
 		    not test_lambda and \
@@ -155,7 +155,9 @@ test-python-universal-athena:
 		    not test_push_offline and \
 		    not test_historical_retrieval_with_validation and \
 		    not test_historical_features_persisting and \
-		    not test_historical_retrieval_fails_on_validation" \
+		    not test_historical_retrieval_fails_on_validation and \
+			not gcs_registry and \
+			not s3_registry"  \
 	sdk/python/tests
 
 

@@ -103,7 +103,6 @@ def pull_latest_from_table_or_query(
         end_date = end_date.astimezone(tz=utc)
 
         query = f"""
-
             SELECT
                 {field_string}
                 {f", {repr(DUMMY_ENTITY_VAL)} AS {DUMMY_ENTITY_ID}" if not join_key_columns else ""}
@@ -358,13 +357,13 @@ def get_temp_table_dml_header(
         self, temp_table_name: str, temp_external_location: str
     ) -> str:
         temp_table_dml_header = f"""
-                                    CREATE TABLE {temp_table_name} 
+                                    CREATE TABLE {temp_table_name}
                                     WITH (
-                                    external_location = '{temp_external_location}', 
+                                    external_location = '{temp_external_location}',
                                     format = 'parquet',
                                     write_compression = 'snappy'
                                     )
-                                    as 
+                                    as
                                 """
         return temp_table_dml_header
 
@@ -598,7 +597,7 @@ def _get_entity_df_event_timestamp_range(
     {% if featureview.date_partition_column != "" and featureview.date_partition_column is not none %}
       AND {{ featureview.date_partition_column }} <= '{{ featureview.max_event_timestamp[:10] }}'
     {% endif %}
-    
+
     {% if featureview.ttl == 0 %}{% else %}
     AND {{ featureview.timestamp_field }} >= from_iso8601_timestamp('{{ featureview.min_event_timestamp }}')
         {% if featureview.date_partition_column != "" and featureview.date_partition_column is not none %}

@@ -1,6 +1,6 @@
 import os
 import uuid
-from typing import Any, Dict, List, Optional
+from typing import Dict, List, Optional
 
 import pandas as pd
 
@@ -16,9 +16,6 @@
 )
 from feast.infra.utils import aws_utils
 from feast.repo_config import FeastConfigBaseModel
-from tests.integration.feature_repos.integration_test_repo_config import (
-    IntegrationTestRepoConfig,
-)
 from tests.integration.feature_repos.universal.data_source_creator import (
     DataSourceCreator,
 )

@@ -1,5 +1,3 @@
-# from feast.infra.offline_stores.contrib.athena_offline_store.tests.data_source import AthenaDataSourceCreator
-
 from tests.integration.feature_repos.integration_test_repo_config import (
     IntegrationTestRepoConfig,
 )
@@ -8,7 +6,6 @@
 )
 
 FULL_REPO_CONFIGS = [
-    IntegrationTestRepoConfig(),
     IntegrationTestRepoConfig(
         provider="aws",
         offline_store_creator=AthenaDataSourceCreator,

@@ -1,4 +1,3 @@
-import importlib
 import os
 from datetime import datetime, timedelta
 

diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py
@@ -27,9 +27,6 @@
 from tests.integration.feature_repos.universal.data_source_creator import (
     DataSourceCreator,
 )
-from tests.integration.feature_repos.universal.data_sources.athena import (
-    AthenaDataSourceCreator,
-)
 from tests.integration.feature_repos.universal.data_sources.bigquery import (
     BigQueryDataSourceCreator,
 )
@@ -92,7 +89,6 @@
     "bigquery": ("gcp", BigQueryDataSourceCreator),
     "redshift": ("aws", RedshiftDataSourceCreator),
     "snowflake": ("aws", SnowflakeDataSourceCreator),
-    "athena": ("aws", AthenaDataSourceCreator),
 }
 
 AVAILABLE_OFFLINE_STORES: List[Tuple[str, Type[DataSourceCreator]]] = [
@@ -112,7 +108,6 @@
             ("gcp", BigQueryDataSourceCreator),
             ("aws", RedshiftDataSourceCreator),
             ("aws", SnowflakeDataSourceCreator),
-            ("aws", AthenaDataSourceCreator),
         ]
     )
 

diff --git a/sdk/python/tests/integration/feature_repos/universal/data_sources/athena.py b/sdk/python/tests/integration/feature_repos/universal/data_sources/athena.py