From 9ad3d18727a3113f12fecb8e7be774a07bcc3dee Mon Sep 17 00:00:00 2001
From: Maroun Touma <touma@us.ibm.com>
Date: Thu, 14 Nov 2024 19:45:21 -0500
Subject: [PATCH] rename make.cicd.target

Signed-off-by: Maroun Touma <touma@us.ibm.com>
---
 .../{.make.modules => .make.cicd.targets}     | 23 +++++++++----------
 transforms/pyproject.toml                     |  4 ++++
 transforms/universal/web2parquet/Makefile     |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)
 rename transforms/{.make.modules => .make.cicd.targets} (79%)

diff --git a/transforms/.make.modules b/transforms/.make.cicd.targets
similarity index 79%
rename from transforms/.make.modules
rename to transforms/.make.cicd.targets
index 36026cc5a..69a5f54fd 100644
--- a/transforms/.make.modules
+++ b/transforms/.make.cicd.targets
@@ -1,13 +1,6 @@
 # Define the root of the local git clone for the common rules to be able 
 # know where they are running from.
 
-# Set this, before including .make.defaults, to 
-#   1 if requirements reference the latest code in the data processing library 
-#     in this repo (that is not yet published to pypi).	 This is the default setting.
-#   0 if the transforms DPK dependencies are on wheels published to 
-#     pypi (e.g. data-prep-toolkit=0.2.1)
-#USE_REPO_LIB_SRC=1
-
 # Include a library of common .transform.* targets which most
 # transforms should be able to reuse.  However, feel free
 # to override/redefine the rules below. 
@@ -15,11 +8,17 @@ include $(REPOROOT)/transforms/.make.transforms
 
 ######################################################################
 ## Default setting for TRANSFORM_RUNTIME uses folder name-- Old layout
-TRANSFORM_RUNTIME=ray
-TRANSFORM_RUNTIME_SRC_FILE=-m dpk_$(TRANSFORM_NAME).$(TRANSFORM_RUNTIME).transform
+TRANSFORM_PYTHON_RUNTIME_SRC_FILE=-m dpk_$(TRANSFORM_NAME).transform
+TRANSFORM_RAY_RUNTIME_SRC_FILE=-m dpk_$(TRANSFORM_NAME).ray.transform
+TRANSFORM_PYTHON_RUNTIME_SRC_FILE=-m dpk_$(TRANSFORM_NAME).spark.transform
+
+venv::	.defaults.create-venv
+	source venv/bin/activate && $(PIP) install -e $(REPOROOT)/data-processing-lib[ray,spark]
+	source venv/bin/activate && $(PIP) install -e $(REPOROOT)/data-connector-lib
+	if [ -e requirements.txt ]; then \
+		source venv/bin/activate && $(PIP) install -r  requirements.txt; \
+	fi; 
 
-venv::	.transforms.ray-venv
-	source venv/bin/activate && $(PYTHON) -m pip install $(REPOROOT)/data-connector-lib
 
 test:: .transforms.test-src test-image
 
@@ -65,7 +64,7 @@ setup:: .transforms.setup
 
 publish-default:: publish-image
 
-publish-image-default:: .transforms.publish-image-ray
+publish-image-default:: .defaults.publish-image
         
 test-image-default:: image .transforms.test-image-help .defaults.test-image-pytest .transforms.clean
 
diff --git a/transforms/pyproject.toml b/transforms/pyproject.toml
index 6e6cc2955..ac05c5884 100644
--- a/transforms/pyproject.toml
+++ b/transforms/pyproject.toml
@@ -78,6 +78,10 @@ resize = { file = ["universal/resize/python/requirements.txt"]}
 # Does not seem to work for our custom layout
 # copy all files to a single src and let automatic discovery find them
 
+
+#[tool.setuptools.package-dir]
+#dpk_web2parquet = "universal/web2parquet/dpk_web2parquet"
+
 [options]
 package_dir = ["src","test"]
 
diff --git a/transforms/universal/web2parquet/Makefile b/transforms/universal/web2parquet/Makefile
index 8978c5d8b..e56e8b816 100644
--- a/transforms/universal/web2parquet/Makefile
+++ b/transforms/universal/web2parquet/Makefile
@@ -1,6 +1,6 @@
 REPOROOT=../../..
 # Use make help, to see the available rules
-include $(REPOROOT)/transforms/.make.modules
+include $(REPOROOT)/transforms/.make.cicd.targets
 
 #
 # This is intended to be included across the Makefiles provided within