Remove forcible replacement of merlin-sdk dep

caraml-dev · Sep 14, 2023 · 163075b · 163075b
1 parent 277bdd6
commit 163075b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/python/batch-predictor/setup.py b/python/batch-predictor/setup.py
@@ -21,11 +21,12 @@
 with open('requirements.txt') as f:
     REQUIRE = f.read().splitlines()
 
-merlin_path = os.path.join(os.getcwd(), "../sdk")
-merlin_sdk_package = "merlin-sdk"
-for index, item in enumerate(REQUIRE):
-    if merlin_sdk_package in item:
-        REQUIRE[index] = f"{merlin_sdk_package} @ file://localhost/{merlin_path}#egg={merlin_sdk_package}"
+# TODO: Uncomment below lines after Pyfunc server stops supporting Python 3.7
+# merlin_path = os.path.join(os.getcwd(), "../sdk")
+# merlin_sdk_package = "merlin-sdk"
+# for index, item in enumerate(REQUIRE):
+#     if merlin_sdk_package in item:
+#         REQUIRE[index] = f"{merlin_sdk_package} @ file://localhost/{merlin_path}#egg={merlin_sdk_package}"
 
 setup(
     name='merlin-pyspark-app',

diff --git a/python/pyfunc-server/setup.py b/python/pyfunc-server/setup.py
@@ -30,11 +30,13 @@
 
 # replace merlin relative path in requirements.txt into absolute path
 # setuptools could not install relative path requirements
-merlin_path = os.path.join(os.getcwd(), "../sdk")
-merlin_sdk_package = "merlin-sdk"
-for index, item in enumerate(REQUIRE):
-    if merlin_sdk_package in item:
-        REQUIRE[index] = f"{merlin_sdk_package} @ file://localhost/{merlin_path}#egg={merlin_sdk_package}"
+
+# TODO: Uncomment below lines after Pyfunc server stops supporting Python 3.7
+# merlin_path = os.path.join(os.getcwd(), "../sdk")
+# merlin_sdk_package = "merlin-sdk"
+# for index, item in enumerate(REQUIRE):
+#     if merlin_sdk_package in item:
+#         REQUIRE[index] = f"{merlin_sdk_package} @ file://localhost/{merlin_path}#egg={merlin_sdk_package}"
 
 setup(
     name='pyfuncserver',