Skip to content

Commit

Permalink
Merge branch 'dev' into pip-instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
touma-I committed Aug 29, 2024
2 parents 2eab81b + 4488a94 commit cc86fb2
Show file tree
Hide file tree
Showing 42 changed files with 562 additions and 632 deletions.
12 changes: 6 additions & 6 deletions .make.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -578,12 +578,12 @@ MINIO_ADMIN_PWD= localminiosecretkey
@# Help: Update pyproject.toml to depend on lib versions defined in .make.versions
@if [ -e pyproject.toml ]; then \
cat pyproject.toml | sed \
-e 's/"data-prep-toolkit-ray\(..\).*",/"data-prep-toolkit-ray\1$(DPK_LIB_VERSION)",/' \
-e 's/"data-prep-toolkit-spark\(..\).*",/"data-prep-toolkit-spark\1$(DPK_LIB_VERSION)",/' \
-e 's/"data-prep-toolkit-kfp\([=><][=><]\).*",/"data-prep-toolkit-kfp\1$(DPK_LIB_KFP_VERSION)",/' \
-e 's/"data-prep-toolkit\([=><][=><]\).*",/"data-prep-toolkit\1$(DPK_LIB_VERSION)",/' \
-e 's/"ray\[default\]\([=><][=><]\).*",/"ray\[default\]\1$(RAY)",/' \
-e 's/"data-prep-toolkit-kfp-shared\(..\).*",/"data-prep-toolkit-kfp-shared\1$(DPK_LIB_KFP_VERSION)",/' \
-e 's/"data-prep-toolkit-ray\([=><~][=]\).*"/"data-prep-toolkit-ray\1$(DPK_LIB_VERSION)"/' \
-e 's/"data-prep-toolkit-spark\([=><~][=]\).*"/"data-prep-toolkit-spark\1$(DPK_LIB_VERSION)"/' \
-e 's/"data-prep-toolkit-kfp\([=><~][=]\).*"/"data-prep-toolkit-kfp\1$(DPK_LIB_KFP_VERSION)"/' \
-e 's/"data-prep-toolkit\([=><~][=]\).*"/"data-prep-toolkit\1$(DPK_LIB_VERSION)"/' \
-e 's/"ray\[default\]\([=><~][=]\).*"/"ray\[default\]\1$(RAY)"/' \
-e 's/"data-prep-toolkit-kfp-shared\(..\).*"/"data-prep-toolkit-kfp-shared\1$(DPK_LIB_KFP_VERSION)"/' \
> tt.toml; \
mv tt.toml pyproject.toml; \
fi
Expand Down
4 changes: 3 additions & 1 deletion .make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ HEADER_CLEANSER_RAY_VERSION=$(DPK_VERSION)

PII_REDACTOR_PYTHON_VERSION=$(DPK_VERSION)

HTML2PARQUET_PYTHON_VERSION=$(DPK_VERSION)

################## ################## ################## ################## ################## ##################
# Begin versions that the repo depends on.

Expand All @@ -114,4 +116,4 @@ ifeq ($(KFPv2), 1)
WORKFLOW_SUPPORT_LIB=kfp_v2_workflow_support
else
WORKFLOW_SUPPORT_LIB=kfp_v1_workflow_support
endif
endif
Loading

0 comments on commit cc86fb2

Please sign in to comment.