From 383e5d2b0462a8bc2f6c0c4e21c0e06735229096 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 18 Aug 2022 12:18:27 +0200 Subject: [PATCH] Add common-sql lower bound for common-sql There are some implicit dependencies for common-sql 1.1.0 version that slipped through our understanding of cross-dependencies (learning for the future). We are bumping dependencies of all the packages that depend on common-sql, to reflect that --- airflow/providers/amazon/provider.yaml | 2 +- airflow/providers/apache/drill/provider.yaml | 2 +- airflow/providers/apache/hive/provider.yaml | 2 +- airflow/providers/apache/pinot/provider.yaml | 2 +- airflow/providers/databricks/provider.yaml | 2 +- airflow/providers/elasticsearch/provider.yaml | 2 +- airflow/providers/exasol/provider.yaml | 2 +- airflow/providers/jdbc/provider.yaml | 2 +- .../providers/microsoft/mssql/provider.yaml | 2 +- airflow/providers/mysql/provider.yaml | 2 +- airflow/providers/odbc/provider.yaml | 2 +- airflow/providers/oracle/provider.yaml | 2 +- airflow/providers/postgres/provider.yaml | 2 +- airflow/providers/presto/provider.yaml | 2 +- airflow/providers/slack/provider.yaml | 2 +- airflow/providers/sqlite/provider.yaml | 2 +- airflow/providers/trino/provider.yaml | 2 +- airflow/providers/vertica/provider.yaml | 2 +- generated/provider_dependencies.json | 36 +++++++++---------- 19 files changed, 36 insertions(+), 36 deletions(-) diff --git a/airflow/providers/amazon/provider.yaml b/airflow/providers/amazon/provider.yaml index 1840dd0ecb709..53db674a3a452 100644 --- a/airflow/providers/amazon/provider.yaml +++ b/airflow/providers/amazon/provider.yaml @@ -45,7 +45,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - boto3>=1.15.0 # watchtower 3 has been released end Jan and introduced breaking change across the board that might # change logging behaviour: diff --git a/airflow/providers/apache/drill/provider.yaml b/airflow/providers/apache/drill/provider.yaml index 30577fb757a96..e7591b4532f97 100644 --- a/airflow/providers/apache/drill/provider.yaml +++ b/airflow/providers/apache/drill/provider.yaml @@ -33,7 +33,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - sqlalchemy-drill>=1.1.0 integrations: diff --git a/airflow/providers/apache/hive/provider.yaml b/airflow/providers/apache/hive/provider.yaml index 038e8241596a1..32d4acd869a46 100644 --- a/airflow/providers/apache/hive/provider.yaml +++ b/airflow/providers/apache/hive/provider.yaml @@ -42,7 +42,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - hmsclient>=0.1.0 - pandas>=0.17.1 - pyhive[hive]>=0.6.0 diff --git a/airflow/providers/apache/pinot/provider.yaml b/airflow/providers/apache/pinot/provider.yaml index afee932a9988a..219f00d477588 100644 --- a/airflow/providers/apache/pinot/provider.yaml +++ b/airflow/providers/apache/pinot/provider.yaml @@ -35,7 +35,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 # pinotdb v0.1.1 may still work with older versions of Apache Pinot, but we've confirmed that it # causes a problem with newer versions. - pinotdb>0.1.2 diff --git a/airflow/providers/databricks/provider.yaml b/airflow/providers/databricks/provider.yaml index 8d4101653e0a5..67402e018c7c2 100644 --- a/airflow/providers/databricks/provider.yaml +++ b/airflow/providers/databricks/provider.yaml @@ -40,7 +40,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - requests>=2.27,<3 - databricks-sql-connector>=2.0.0, <3.0.0 - aiohttp>=3.6.3, <4 diff --git a/airflow/providers/elasticsearch/provider.yaml b/airflow/providers/elasticsearch/provider.yaml index 1c7ef9ababa06..16020b3ea3e8a 100644 --- a/airflow/providers/elasticsearch/provider.yaml +++ b/airflow/providers/elasticsearch/provider.yaml @@ -42,7 +42,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - elasticsearch>7 - elasticsearch-dbapi - elasticsearch-dsl>=5.0.0 diff --git a/airflow/providers/exasol/provider.yaml b/airflow/providers/exasol/provider.yaml index 9693d57a84016..53ce6121c8142 100644 --- a/airflow/providers/exasol/provider.yaml +++ b/airflow/providers/exasol/provider.yaml @@ -37,7 +37,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - pyexasol>=0.5.1 - pandas>=0.17.1 diff --git a/airflow/providers/jdbc/provider.yaml b/airflow/providers/jdbc/provider.yaml index a2a36e40ca201..c23c72e508a16 100644 --- a/airflow/providers/jdbc/provider.yaml +++ b/airflow/providers/jdbc/provider.yaml @@ -36,7 +36,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - jaydebeapi>=1.1.1 integrations: diff --git a/airflow/providers/microsoft/mssql/provider.yaml b/airflow/providers/microsoft/mssql/provider.yaml index d4031bc5d4770..70c6f61e3dbcc 100644 --- a/airflow/providers/microsoft/mssql/provider.yaml +++ b/airflow/providers/microsoft/mssql/provider.yaml @@ -37,7 +37,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - pymssql>=2.1.5; platform_machine != "aarch64" integrations: diff --git a/airflow/providers/mysql/provider.yaml b/airflow/providers/mysql/provider.yaml index f7872832891c0..5e8a85a6b9471 100644 --- a/airflow/providers/mysql/provider.yaml +++ b/airflow/providers/mysql/provider.yaml @@ -39,7 +39,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - mysql-connector-python>=8.0.11; platform_machine != "aarch64" - mysqlclient>=1.3.6; platform_machine != "aarch64" diff --git a/airflow/providers/odbc/provider.yaml b/airflow/providers/odbc/provider.yaml index 13809471272c0..b697f76b70ec6 100644 --- a/airflow/providers/odbc/provider.yaml +++ b/airflow/providers/odbc/provider.yaml @@ -35,7 +35,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - pyodbc integrations: diff --git a/airflow/providers/oracle/provider.yaml b/airflow/providers/oracle/provider.yaml index 5a2982e73c3c1..43a566710059e 100644 --- a/airflow/providers/oracle/provider.yaml +++ b/airflow/providers/oracle/provider.yaml @@ -39,7 +39,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - oracledb>=1.0.0 integrations: diff --git a/airflow/providers/postgres/provider.yaml b/airflow/providers/postgres/provider.yaml index 4d059bb4fdc22..d3476f08f3fae 100644 --- a/airflow/providers/postgres/provider.yaml +++ b/airflow/providers/postgres/provider.yaml @@ -40,7 +40,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - psycopg2-binary>=2.7.4 integrations: diff --git a/airflow/providers/presto/provider.yaml b/airflow/providers/presto/provider.yaml index 33ed4ec19383b..3d09cd9914c88 100644 --- a/airflow/providers/presto/provider.yaml +++ b/airflow/providers/presto/provider.yaml @@ -38,7 +38,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - presto-python-client>=0.8.2 - pandas>=0.17.1 diff --git a/airflow/providers/slack/provider.yaml b/airflow/providers/slack/provider.yaml index e77d06f55e57c..57843af639867 100644 --- a/airflow/providers/slack/provider.yaml +++ b/airflow/providers/slack/provider.yaml @@ -37,7 +37,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - apache-airflow-providers-http - slack_sdk>=3.0.0 diff --git a/airflow/providers/sqlite/provider.yaml b/airflow/providers/sqlite/provider.yaml index 0a62b142ea573..b1a0865b375e1 100644 --- a/airflow/providers/sqlite/provider.yaml +++ b/airflow/providers/sqlite/provider.yaml @@ -36,7 +36,7 @@ versions: - 1.0.0 dependencies: - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 integrations: - integration-name: SQLite diff --git a/airflow/providers/trino/provider.yaml b/airflow/providers/trino/provider.yaml index 94452570161f2..f1434185f2b2d 100644 --- a/airflow/providers/trino/provider.yaml +++ b/airflow/providers/trino/provider.yaml @@ -37,7 +37,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - pandas>=0.17.1 - trino>=0.301.0 diff --git a/airflow/providers/vertica/provider.yaml b/airflow/providers/vertica/provider.yaml index 020a58c27f77c..46818af460009 100644 --- a/airflow/providers/vertica/provider.yaml +++ b/airflow/providers/vertica/provider.yaml @@ -36,7 +36,7 @@ versions: dependencies: - apache-airflow>=2.2.0 - - apache-airflow-providers-common-sql + - apache-airflow-providers-common-sql>=1.1.0 - vertica-python>=0.5.1 integrations: diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index e65ee42833e5b..afb04628331c9 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -17,7 +17,7 @@ }, "amazon": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "boto3>=1.15.0", "jsonpath_ng>=1.5.3", @@ -60,7 +60,7 @@ }, "apache.drill": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "sqlalchemy-drill>=1.1.0" ], @@ -89,7 +89,7 @@ }, "apache.hive": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "hmsclient>=0.1.0", "pandas>=0.17.1", @@ -131,7 +131,7 @@ }, "apache.pinot": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "pinotdb>0.1.2" ], @@ -198,7 +198,7 @@ "databricks": { "deps": [ "aiohttp>=3.6.3, <4", - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "databricks-sql-connector>=2.0.0, <3.0.0", "requests>=2.27,<3" @@ -250,7 +250,7 @@ }, "elasticsearch": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "elasticsearch-dbapi", "elasticsearch-dsl>=5.0.0", @@ -262,7 +262,7 @@ }, "exasol": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "pandas>=0.17.1", "pyexasol>=0.5.1" @@ -397,7 +397,7 @@ }, "jdbc": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "jaydebeapi>=1.1.1" ], @@ -445,7 +445,7 @@ }, "microsoft.mssql": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "pymssql>=2.1.5; platform_machine != \"aarch64\"" ], @@ -476,7 +476,7 @@ }, "mysql": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "mysql-connector-python>=8.0.11; platform_machine != \"aarch64\"", "mysqlclient>=1.3.6; platform_machine != \"aarch64\"" @@ -498,7 +498,7 @@ }, "odbc": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "pyodbc" ], @@ -521,7 +521,7 @@ }, "oracle": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "oracledb>=1.0.0" ], @@ -553,7 +553,7 @@ }, "postgres": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "psycopg2-binary>=2.7.4" ], @@ -564,7 +564,7 @@ }, "presto": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "pandas>=0.17.1", "presto-python-client>=0.8.2" @@ -638,7 +638,7 @@ }, "slack": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow-providers-http", "apache-airflow>=2.2.0", "slack_sdk>=3.0.0" @@ -662,7 +662,7 @@ }, "sqlite": { "deps": [ - "apache-airflow-providers-common-sql" + "apache-airflow-providers-common-sql>=1.1.0" ], "cross-providers-deps": [ "common.sql" @@ -698,7 +698,7 @@ }, "trino": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "pandas>=0.17.1", "trino>=0.301.0" @@ -710,7 +710,7 @@ }, "vertica": { "deps": [ - "apache-airflow-providers-common-sql", + "apache-airflow-providers-common-sql>=1.1.0", "apache-airflow>=2.2.0", "vertica-python>=0.5.1" ],