-
Notifications
You must be signed in to change notification settings - Fork 161
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Build transforms wheel #493
Changes from all commits
ddedccc
134c2c2
e227b9d
d155a24
fe0d380
b1e2707
d96477a
3c57682
35c7e60
d66df27
a4f7e0a
0af03cc
65f4ac4
703ebe0
d54708a
e1309e5
109ea29
a874358
440975d
10c9159
db60963
9bb36c5
ee63628
346b82e
071836e
07b827f
0369842
aa297e0
32578d5
3b52ecf
eb499de
8d69b71
d27a1c2
e155d2c
33b8853
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
name: Test - transforms/packaging/python | ||
|
||
on: | ||
workflow_dispatch: | ||
push: | ||
branches: | ||
- "dev" | ||
- "releases/**" | ||
tags: | ||
- "*" | ||
paths: | ||
- "transforms/packaging/python/**" | ||
- "!**.md" | ||
- "!**/doc/**" | ||
- "!**/images/**" | ||
- "!**.gitignore" | ||
pull_request: | ||
branches: | ||
- "dev" | ||
- "releases/**" | ||
paths: | ||
- "transforms/packaging/python/**" | ||
- "!**.md" | ||
- "!**/doc/**" | ||
- "!**/images/**" | ||
- "!**.gitignore" | ||
|
||
jobs: | ||
test-src: | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
- name: Free up space in github runner | ||
# Free space as indicated here : https://github.com/actions/runner-images/issues/2840#issuecomment-790492173 | ||
run: | | ||
df -h | ||
sudo rm -rf "/usr/local/share/boost" | ||
sudo rm -rf "$AGENT_TOOLSDIRECTORY" | ||
sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /usr/local/share/powershell /usr/share/swift /usr/local/.ghcup | ||
sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true | ||
df -h | ||
- name: Test transform source in transforms/packaging/python | ||
run: | | ||
if [ -e "transforms/packaging/python/Makefile" ]; then | ||
make -C transforms/packaging/python DOCKER=docker test-src | ||
else | ||
echo "transforms/packaging/python/Makefile not found - source testing disabled for this transform." | ||
fi |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
name: Test - transforms/packaging/ray | ||
|
||
on: | ||
workflow_dispatch: | ||
push: | ||
branches: | ||
- "dev" | ||
- "releases/**" | ||
tags: | ||
- "*" | ||
paths: | ||
- "transforms/packaging/ray/**" | ||
- "!**.md" | ||
- "!**/doc/**" | ||
- "!**/images/**" | ||
- "!**.gitignore" | ||
pull_request: | ||
branches: | ||
- "dev" | ||
- "releases/**" | ||
paths: | ||
- "transforms/packaging/ray/**" | ||
- "!**.md" | ||
- "!**/doc/**" | ||
- "!**/images/**" | ||
- "!**.gitignore" | ||
|
||
jobs: | ||
test-src: | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
- name: Free up space in github runner | ||
# Free space as indicated here : https://github.com/actions/runner-images/issues/2840#issuecomment-790492173 | ||
run: | | ||
df -h | ||
sudo rm -rf "/usr/local/share/boost" | ||
sudo rm -rf "$AGENT_TOOLSDIRECTORY" | ||
sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /usr/local/share/powershell /usr/share/swift /usr/local/.ghcup | ||
sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true | ||
df -h | ||
- name: Test transform source in transforms/packaging/ray | ||
run: | | ||
if [ -e "transforms/packaging/ray/Makefile" ]; then | ||
make -C transforms/packaging/ray DOCKER=docker test-src | ||
else | ||
echo "transforms/packaging/ray/Makefile not found - source testing disabled for this transform." | ||
fi |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -480,7 +480,8 @@ endif | |
if [ -e requirements.txt ]; then \ | ||
echo Installing requirements from requirements.txt; \ | ||
pip install $(PIP_INSTALL_EXTRA_ARGS) $$extra_url -r requirements.txt; \ | ||
elif [ -e pyproject.toml ]; then \ | ||
fi; \ | ||
if [ -e pyproject.toml ]; then \ | ||
echo Installing from pyproject.toml; \ | ||
pip install $(PIP_INSTALL_EXTRA_ARGS) $$extra_url -e .; \ | ||
fi | ||
|
@@ -587,6 +588,18 @@ MINIO_ADMIN_PWD= localminiosecretkey | |
> tt.toml; \ | ||
mv tt.toml pyproject.toml; \ | ||
fi | ||
@if [ -e requirements.txt ]; then \ | ||
cat requirements.txt | sed \ | ||
-e 's/data-prep-toolkit-ray\([=><~][=]\).*/data-prep-toolkit-ray\1$(DPK_LIB_VERSION)/' \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can all these There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes. Almost but not exactly. But agree, I will take a deeper look in a followup PR. |
||
-e 's/data-prep-toolkit-transforms\([=><~][=]\).*/data-prep-toolkit-transforms\1$(DPK_TRANSFORMS_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.txt; \ | ||
mv tt.txt requirements.txt; \ | ||
fi | ||
|
||
# Build the distribution, usually in preparation for publishing using ith the .defaults.publish-dist target | ||
.PHONY: .defaults.build-dist | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "data_prep_toolkit_ray" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
daw3rd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
keywords = ["data", "data preprocessing", "data preparation", "llm", "generative", "ai", "fine-tuning", "llmapps" ] | ||
requires-python = ">=3.10" | ||
description = "Data Preparation Toolkit Library for Ray" | ||
|
@@ -11,7 +11,7 @@ authors = [ | |
{ name = "Boris Lublinsky", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit==0.2.1.dev0", | ||
"data-prep-toolkit>=0.2.1.dev3", | ||
"ray[default]==2.24.0", | ||
# These two are to fix security issues identified by quay.io | ||
"fastapi>=0.110.2", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "data_prep_toolkit_spark" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
keywords = ["data", "data preprocessing", "data preparation", "llm", "generative", "ai", "fine-tuning", "llmapps" ] | ||
requires-python = ">=3.10" | ||
description = "Data Preparation Toolkit Library for Spark" | ||
|
@@ -11,7 +11,7 @@ authors = [ | |
{ name = "Boris Lublinsky", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit==0.2.1.dev0", | ||
"data-prep-toolkit==0.2.1.dev3", | ||
"pyspark>=3.5.2", | ||
"psutil>=6.0.0" | ||
] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
## Data prep kit | ||
data-prep-toolkit-transforms==0.2.1.dev1 | ||
data-prep-toolkit-transforms-ray==0.2.1.dev1 | ||
#data-prep-toolkit-transforms==0.2.1.dev1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I see that these are comments, but should they be with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not sure this notebook will still work with dev3. There were changes to the transforms that broke the notebook. I think Sunjee has a new release he will be checking in soon. |
||
#data-prep-toolkit-transforms-ray==0.2.1.dev1 | ||
|
||
|
||
|
||
|
@@ -53,4 +53,4 @@ ipython | |
ipywidgets | ||
IProgress | ||
chardet==5.2.0 | ||
charset-normalizer==3.3.2 | ||
charset-normalizer==3.3.2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "data_prep_toolkit_kfp_v2" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10,<3.12" | ||
description = "Data Preparation Kit Library. KFP support" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -12,9 +12,9 @@ authors = [ | |
{ name = "Revital Eres", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"kfp==2.7.0", | ||
"kfp==2.8.0", | ||
"kfp-kubernetes==1.2.0", | ||
"data-prep-toolkit-kfp-shared==0.2.1.dev0", | ||
"data-prep-toolkit-kfp-shared==0.2.1.dev3", | ||
] | ||
|
||
[build-system] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_code2parquet_transform_python" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "code2parquet Python Transform" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -10,7 +10,7 @@ authors = [ | |
{ name = "Boris Lublinsky", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit==0.2.1.dev0", | ||
"data-prep-toolkit==0.2.1.dev3", | ||
"parameterized", | ||
"pandas", | ||
] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_code2parquet_transform_ray" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "code2parquet Ray Transform" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -10,8 +10,8 @@ authors = [ | |
{ name = "Boris Lublinsky", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit-ray==0.2.1.dev0", | ||
"dpk-code2parquet-transform-python==0.2.1.dev0", | ||
"data-prep-toolkit-ray==0.2.1.dev3", | ||
"dpk-code2parquet-transform-python==0.2.1.dev3", | ||
"parameterized", | ||
"pandas", | ||
] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_code_quality_transform_python" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "Code Quality Python Transform" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -9,7 +9,7 @@ authors = [ | |
{ name = "Shivdeep Singh", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit==0.2.1.dev0", | ||
"data-prep-toolkit==0.2.1.dev3", | ||
"bs4==0.0.2", | ||
"transformers==4.38.2", | ||
] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_code_quality_transform_ray" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "Code Quality Ray Transform" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -9,8 +9,8 @@ authors = [ | |
{ name = "Shivdeep Singh", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"dpk-code-quality-transform-python==0.2.1.dev0", | ||
"data-prep-toolkit-ray==0.2.1.dev0", | ||
"dpk-code-quality-transform-python==0.2.1.dev3", | ||
"data-prep-toolkit-ray==0.2.1.dev3", | ||
] | ||
|
||
[build-system] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_header_cleanser_transform_python" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "License and Copyright Removal Transform for Python" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -9,7 +9,7 @@ authors = [ | |
{ name = "Yash kalathiya", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit==0.2.1.dev0", | ||
"data-prep-toolkit==0.2.1.dev3", | ||
"scancode-toolkit==32.1.0", | ||
] | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_header_cleanser_transform_ray" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "License and copyright removal Transform for Ray" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -9,8 +9,8 @@ authors = [ | |
{ name = "Yash kalathiya", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"dpk-header-cleanser-transform-python==0.2.1.dev0", | ||
"data-prep-toolkit-ray==0.2.1.dev0", | ||
"dpk-header-cleanser-transform-python==0.2.1.dev3", | ||
"data-prep-toolkit-ray==0.2.1.dev3", | ||
"scancode-toolkit==32.1.0", | ||
] | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[project] | ||
name = "dpk_malware_transform_python" | ||
version = "0.2.1.dev0" | ||
version = "0.2.1.dev3" | ||
requires-python = ">=3.10" | ||
description = "Malware Python Transform" | ||
license = {text = "Apache-2.0"} | ||
|
@@ -9,7 +9,7 @@ authors = [ | |
{ name = "Takuya Goto", email = "[email protected]" }, | ||
] | ||
dependencies = [ | ||
"data-prep-toolkit==0.2.1.dev0", | ||
"data-prep-toolkit==0.2.1.dev3", | ||
"clamd==1.0.2", | ||
] | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so you want to allow dependencies installation from both
requirements.txt
andpyproject.toml
. It can confuse.I'd add a WARNING message if both files exist. And specify in the message the installation order: first from requirements.txt
and after that from
pyproject.toml`There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @roytman . The situation we ran into is the pyproject.toml for the single package is using requirements.txt that was compiled from the different dependencies listed by all transforms. I will also be changing all the transforms pyproject.toml to use requirements.txt to list their dependencies. But agree, I need to watch this one closely.