diff --git a/Dockerfile.ci b/Dockerfile.ci index 3ddba289a807f8..cdf80c9b915937 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1195,7 +1195,7 @@ ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow" # NOTE! When you want to make sure dependencies are installed from scratch in your PR after removing # some dependencies, you also need to set "disable image cache" in your PR to make sure the image is # not built using the "main" version of those dependencies. -ARG DEPENDENCIES_EPOCH_NUMBER="11" +ARG DEPENDENCIES_EPOCH_NUMBER="12" # Make sure noninteractive debian install is used and language variables set ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE} \ diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index 3cc937f775775c..e90632330e25e4 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -548,7 +548,7 @@ def get_airflow_extras(): # END OF EXTRAS LIST UPDATED BY PRE COMMIT ] -CHICKEN_EGG_PROVIDERS = " ".join(["standard"]) +CHICKEN_EGG_PROVIDERS = " ".join(["standard amazon"]) BASE_PROVIDERS_COMPATIBILITY_CHECKS: list[dict[str, str | list[str]]] = [ diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 7bfbd76acad7fe..d2c69029cc08b9 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -38,7 +38,6 @@ "jsonpath_ng>=1.5.3", "python3-saml>=1.16.0", "redshift_connector>=2.0.918", - "sqlalchemy_redshift>=0.8.6", "watchtower>=3.0.0,!=3.3.0,<4" ], "devel-deps": [ diff --git a/providers/src/airflow/providers/amazon/aws/hooks/redshift_sql.py b/providers/src/airflow/providers/amazon/aws/hooks/redshift_sql.py index 2b3b75dca6d456..bfdf807318a20a 100644 --- a/providers/src/airflow/providers/amazon/aws/hooks/redshift_sql.py +++ b/providers/src/airflow/providers/amazon/aws/hooks/redshift_sql.py @@ -163,7 +163,7 @@ def get_uri(self) -> str: # Compatibility: The 'create' factory method was added in SQLAlchemy 1.4 # to replace calling the default URL constructor directly. create_url = getattr(URL, "create", URL) - return str(create_url(drivername="redshift+redshift_connector", **conn_params)) + return str(create_url(drivername="postgresql", **conn_params)) def get_sqlalchemy_engine(self, engine_kwargs=None): """Overridden to pass Redshift-specific arguments.""" diff --git a/providers/src/airflow/providers/amazon/provider.yaml b/providers/src/airflow/providers/amazon/provider.yaml index a8d182b9049541..11e6dc8db753f7 100644 --- a/providers/src/airflow/providers/amazon/provider.yaml +++ b/providers/src/airflow/providers/amazon/provider.yaml @@ -106,7 +106,6 @@ dependencies: - watchtower>=3.0.0,!=3.3.0,<4 - jsonpath_ng>=1.5.3 - redshift_connector>=2.0.918 - - sqlalchemy_redshift>=0.8.6 - asgiref>=2.3.0 - PyAthena>=3.0.10 - jmespath>=0.7.0 diff --git a/providers/tests/amazon/aws/hooks/test_redshift_sql.py b/providers/tests/amazon/aws/hooks/test_redshift_sql.py index aced8cae136748..70cd69c40ed808 100644 --- a/providers/tests/amazon/aws/hooks/test_redshift_sql.py +++ b/providers/tests/amazon/aws/hooks/test_redshift_sql.py @@ -50,7 +50,7 @@ def setup_method(self): self.db_hook.get_connection.return_value = self.connection def test_get_uri(self): - expected = "redshift+redshift_connector://login:password@host:5439/dev" + expected = "postgresql://login:password@host:5439/dev" x = self.db_hook.get_uri() assert x == expected