move USE_REPO_LIB_SRC into Makefiles

Signed-off-by: David Wood <dawood@us.ibm.com>
IBM · Oct 4, 2024 · 8ad1954 · 8ad1954
1 parent 1122824
commit 8ad1954
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/transforms/universal/noop/kfp_ray/Makefile b/transforms/universal/noop/kfp_ray/Makefile
@@ -1,12 +1,11 @@
 REPOROOT=${CURDIR}/../../../../
 
-# Include the common configuration for this transform, which may configure
-# later includes
-include ../transform.config
-
 WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
+# Include the common configuration for this transform
+include ../transform.config
+
 SRC_DIR=${CURDIR}/../ray/
 
 PYTHON_WF := $(shell find ./ -name '*_wf.py')

diff --git a/transforms/universal/noop/python/Makefile b/transforms/universal/noop/python/Makefile
@@ -2,16 +2,20 @@
 # know where they are running from.
 REPOROOT=../../../..
 
-# Include the common configuration for this transform, which may configure
-# later includes
-include ../transform.config
+# 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. 
 include $(REPOROOT)/transforms/.make.transforms
 
-
+# Include the common configuration for this transform
+include ../transform.config
 
 venv::	.transforms.python-venv
 

diff --git a/transforms/universal/noop/ray/Makefile b/transforms/universal/noop/ray/Makefile
@@ -2,15 +2,22 @@
 # know where they are running from.
 REPOROOT=../../../..
 
-# Include the common configuration for this transform, which may configure
-# later includes
-include ../transform.config
+# 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. 
 include $(REPOROOT)/transforms/.make.transforms
 
+# Include the common configuration for this transform
+include ../transform.config
+
+
 BASE_IMAGE=${RAY_BASE_IMAGE}
 
 venv::	.transforms.ray-venv

diff --git a/transforms/universal/noop/spark/Makefile b/transforms/universal/noop/spark/Makefile
@@ -2,15 +2,21 @@
 # know where they are running from.
 REPOROOT=../../../..
 
-# Include the common configuration for this transform, which may configure
-# later includes
-include ../transform.config
+# 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. 
 include $(REPOROOT)/transforms/.make.transforms
 
+# Include the common configuration for this transform
+include ../transform.config
+
 venv::	.transforms.spark-venv
 
 test::	.transforms.spark-test