fix: Remove unnecessary dependency on mysqlclient (#3925)

tokoko · web-flow · commit f494f02e1254 · 2024-02-04T12:26:12.000-05:00
diff --git a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile
@@ -4,7 +4,6 @@ RUN apt update && \
         apt install -y \
         jq \
         python3-dev \
-        default-libmysqlclient-dev \
         build-essential
 
 RUN pip install pip --upgrade
diff --git a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev
@@ -4,7 +4,6 @@ RUN apt update && \
         apt install -y \
         jq \
         python3-dev \
-        default-libmysqlclient-dev \
         build-essential
 
 RUN pip install pip --upgrade
diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt
@@ -472,8 +472,6 @@ mypy-extensions==1.0.0
     #   mypy
 mypy-protobuf==3.1.0
     # via feast (setup.py)
-mysqlclient==2.2.0
-    # via feast (setup.py)
 nbclient==0.9.0
     # via nbconvert
 nbconvert==7.11.0
diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt
@@ -488,8 +488,6 @@ mypy-extensions==1.0.0
     #   mypy
 mypy-protobuf==3.1.0
     # via feast (setup.py)
-mysqlclient==2.2.0
-    # via feast (setup.py)
 nbclient==0.9.0
     # via nbconvert
 nbconvert==7.11.0
diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt
@@ -479,8 +479,6 @@ mypy-extensions==1.0.0
     #   mypy
 mypy-protobuf==3.1.0
     # via feast (setup.py)
-mysqlclient==2.2.0
-    # via feast (setup.py)
 nbclient==0.9.0
     # via nbconvert
 nbconvert==7.11.0
diff --git a/sdk/python/tests/unit/test_sql_registry.py b/sdk/python/tests/unit/test_sql_registry.py
@@ -103,7 +103,7 @@ def mysql_registry():
 
     registry_config = RegistryConfig(
         registry_type="sql",
-        path=f"mysql+mysqldb://{POSTGRES_USER}:{POSTGRES_PASSWORD}@127.0.0.1:{container_port}/{POSTGRES_DB}",
+        path=f"mysql+pymysql://{POSTGRES_USER}:{POSTGRES_PASSWORD}@127.0.0.1:{container_port}/{POSTGRES_DB}",
     )
 
     yield SqlRegistry(registry_config, "project", None)
diff --git a/setup.py b/setup.py
@@ -116,7 +116,7 @@
     "psycopg2-binary>=2.8.3,<3",
 ]
 
-MYSQL_REQUIRED = ["mysqlclient", "pymysql", "types-PyMySQL"]
+MYSQL_REQUIRED = ["pymysql", "types-PyMySQL"]
 
 HBASE_REQUIRED = [
     "happybase>=1.2.0,<3",

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ def mysql_registry():`
`103`	`103`
`104`	`104`	`registry_config = RegistryConfig(`
`105`	`105`	`registry_type="sql",`
`106`		`- path=f"mysql+mysqldb://{POSTGRES_USER}:{POSTGRES_PASSWORD}@127.0.0.1:{container_port}/{POSTGRES_DB}",`
	`106`	`+ path=f"mysql+pymysql://{POSTGRES_USER}:{POSTGRES_PASSWORD}@127.0.0.1:{container_port}/{POSTGRES_DB}",`
`107`	`107`	`)`
`108`	`108`
`109`	`109`	`yield SqlRegistry(registry_config, "project", None)`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@`
`116`	`116`	`"psycopg2-binary>=2.8.3,<3",`
`117`	`117`	`]`
`118`	`118`
`119`		`-MYSQL_REQUIRED = ["mysqlclient", "pymysql", "types-PyMySQL"]`
	`119`	`+MYSQL_REQUIRED = ["pymysql", "types-PyMySQL"]`
`120`	`120`
`121`	`121`	`HBASE_REQUIRED = [`
`122`	`122`	`"happybase>=1.2.0,<3",`