Bring back mysql-connector-python as required depednency (#32989)

The mysql-connector-python 8.1.0 was released 18th of July with Protobuf 4 support - thus resolving dependency conflicts we had.
apache · Aug 4, 2023 · 108a07b · 108a07b
1 parent c048bd5
commit 108a07b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/airflow/providers/apache/hive/transfers/mysql_to_hive.py b/airflow/providers/apache/hive/transfers/mysql_to_hive.py
@@ -151,7 +151,7 @@ def execute(self, context: Context):
                     if cursor.description is not None:
                         for field in cursor.description:
                             field_dict[field[0]] = self.type_map(field[1])
-                    csv_writer.writerows(cursor)
+                    csv_writer.writerows(cursor)  # type: ignore[arg-type]
             f.flush()
             self.log.info("Loading file into Hive")
             hive.load_file(

diff --git a/airflow/providers/mysql/CHANGELOG.rst b/airflow/providers/mysql/CHANGELOG.rst
@@ -26,6 +26,9 @@
 Changelog
 ---------
 
+This release brings back mysql-connector-python as required dependency of the provider - since 8.1.0
+version has been released with Protobuf 4 support, removing dependency conflicts with other providers.
+
 5.2.0
 .....
 

diff --git a/airflow/providers/mysql/provider.yaml b/airflow/providers/mysql/provider.yaml
@@ -52,6 +52,7 @@ dependencies:
   - apache-airflow>=2.4.0
   - apache-airflow-providers-common-sql>=1.3.1
   - mysqlclient>=1.3.6
+  - mysql-connector-python>=8.0.11
 
 integrations:
   - integration-name: MySQL
@@ -92,6 +93,6 @@ connection-types:
     connection-type: mysql
 
 additional-extras:
+  # only needed for backwards compatibility
   - name: mysql-connector-python
-    dependencies:
-      - mysql-connector-python>=8.0.11
+    dependencies: []
diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
@@ -615,6 +615,7 @@
     "deps": [
       "apache-airflow-providers-common-sql>=1.3.1",
       "apache-airflow>=2.4.0",
+      "mysql-connector-python>=8.0.11",
       "mysqlclient>=1.3.6"
     ],
     "cross-providers-deps": [

diff --git a/tests/providers/mysql/hooks/test_mysql_connector_python.py b/tests/providers/mysql/hooks/test_mysql_connector_python.py
@@ -20,14 +20,9 @@
 import json
 from unittest import mock
 
-import pytest
-
 from airflow.models import Connection
 from airflow.providers.mysql.hooks.mysql import MySqlHook
 
-# Make sure that the optional package 'mysql-connector-python' is installed (which is not by default)
-pytest.importorskip("mysql")
-
 
 class TestMySqlHookConnMySqlConnectorPython:
     def setup_method(self):