Skip to content

Commit 74cb870

Browse files
authored
Merge pull request #35933: [Postrelease-2.67.0] Remove mysql-connector-python dependency
2 parents ab2b8d3 + b6451a0 commit 74cb870

File tree

10 files changed

+14
-28
lines changed

10 files changed

+14
-28
lines changed

sdks/python/apache_beam/yaml/integration_tests.py

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
from datetime import timezone
3434

3535
import mock
36-
import mysql.connector
3736
import psycopg2
3837
import pytds
3938
import sqlalchemy
@@ -286,26 +285,22 @@ def temp_mysql_database():
286285
Exception: Any other exception encountered during the setup process.
287286
"""
288287
with MySqlContainer(init=True, dialect='pymysql') as mysql_container:
289-
try:
290-
# Make connection to temp database and create tmp table
291-
engine = sqlalchemy.create_engine(mysql_container.get_connection_url())
292-
with engine.begin() as connection:
293-
connection.execute(
294-
sqlalchemy.text(
295-
"CREATE TABLE tmp_table (value INTEGER, `rank` INTEGER);"))
288+
# Make connection to temp database and create tmp table
289+
engine = sqlalchemy.create_engine(mysql_container.get_connection_url())
290+
with engine.begin() as connection:
291+
connection.execute(
292+
sqlalchemy.text(
293+
"CREATE TABLE tmp_table (value INTEGER, `rank` INTEGER);"))
296294

297-
# Construct the JDBC url for connections later on by tests
298-
jdbc_url = (
299-
f"jdbc:mysql://{mysql_container.get_container_host_ip()}:"
300-
f"{mysql_container.get_exposed_port(mysql_container.port)}/"
301-
f"{mysql_container.dbname}?"
302-
f"user={mysql_container.username}&"
303-
f"password={mysql_container.password}")
295+
# Construct the JDBC url for connections later on by tests
296+
jdbc_url = (
297+
f"jdbc:mysql://{mysql_container.get_container_host_ip()}:"
298+
f"{mysql_container.get_exposed_port(mysql_container.port)}/"
299+
f"{mysql_container.dbname}?"
300+
f"user={mysql_container.username}&"
301+
f"password={mysql_container.password}")
304302

305-
yield jdbc_url
306-
except mysql.connector.Error as err:
307-
logging.error("Error interacting with temporary MySQL DB: %s", err)
308-
raise err
303+
yield jdbc_url
309304

310305

311306
@contextlib.contextmanager

sdks/python/container/py310/base_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ mmh3==5.1.0
113113
mock==5.2.0
114114
more-itertools==10.7.0
115115
multidict==6.6.3
116-
mysql-connector-python==9.3.0
117116
nltk==3.9.1
118117
numpy==2.2.6
119118
oauth2client==4.1.3

sdks/python/container/py310/ml_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ mock==5.2.0
130130
more-itertools==10.7.0
131131
mpmath==1.3.0
132132
multidict==6.6.3
133-
mysql-connector-python==9.3.0
134133
namex==0.1.0
135134
networkx==3.4.2
136135
nltk==3.9.1

sdks/python/container/py311/base_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ mmh3==5.1.0
111111
mock==5.2.0
112112
more-itertools==10.7.0
113113
multidict==6.6.3
114-
mysql-connector-python==9.3.0
115114
nltk==3.9.1
116115
numpy==2.2.6
117116
oauth2client==4.1.3

sdks/python/container/py311/ml_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ mock==5.2.0
128128
more-itertools==10.7.0
129129
mpmath==1.3.0
130130
multidict==6.6.3
131-
mysql-connector-python==9.3.0
132131
namex==0.1.0
133132
networkx==3.5
134133
nltk==3.9.1

sdks/python/container/py312/base_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ mmh3==5.1.0
110110
mock==5.2.0
111111
more-itertools==10.7.0
112112
multidict==6.6.3
113-
mysql-connector-python==9.3.0
114113
nltk==3.9.1
115114
numpy==2.2.6
116115
oauth2client==4.1.3

sdks/python/container/py312/ml_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ mock==5.2.0
127127
more-itertools==10.7.0
128128
mpmath==1.3.0
129129
multidict==6.6.3
130-
mysql-connector-python==9.3.0
131130
namex==0.1.0
132131
networkx==3.5
133132
nltk==3.9.1

sdks/python/container/py39/base_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ mmh3==5.1.0
113113
mock==5.2.0
114114
more-itertools==10.7.0
115115
multidict==6.6.3
116-
mysql-connector-python==9.3.0
117116
nltk==3.9.1
118117
numpy==2.0.2
119118
oauth2client==4.1.3

sdks/python/container/py39/ml_image_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ mock==5.2.0
130130
more-itertools==10.7.0
131131
mpmath==1.3.0
132132
multidict==6.6.3
133-
mysql-connector-python==9.3.0
134133
namex==0.1.0
135134
networkx==3.2.1
136135
nltk==3.9.1

sdks/python/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@ def get_portability_package_data():
442442
'cryptography>=41.0.2',
443443
'hypothesis>5.0.0,<7.0.0',
444444
'virtualenv-clone>=0.5,<1.0',
445-
'mysql-connector-python>=9.3.0',
446445
'python-tds>=1.16.1',
447446
'sqlalchemy-pytds>=1.0.2',
448447
'oracledb>=3.1.1'

0 commit comments

Comments
 (0)