Skip to content

Commit a730d20

Browse files
authored
Misc CI fixes (#3780)
* Fix flaky FS test * Remove unused file * Exclude vllm integration to install more recent torch * Log CLI command output if failed * Unused ignore * Load iris dataset using sklearn
1 parent 03aa795 commit a730d20

File tree

6 files changed

+15
-1510
lines changed

6 files changed

+15
-1510
lines changed

.test_durations

Lines changed: 0 additions & 1501 deletions
This file was deleted.

scripts/install-zenml-dev.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ install_integrations() {
3636
# figure out the python version
3737
python_version=$(python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
3838

39-
ignore_integrations="feast label_studio bentoml seldon pycaret skypilot_aws skypilot_gcp skypilot_azure skypilot_kubernetes skypilot_lambda pigeon prodigy argilla"
39+
ignore_integrations="feast label_studio bentoml seldon pycaret skypilot_aws skypilot_gcp skypilot_azure skypilot_kubernetes skypilot_lambda pigeon prodigy argilla vllm"
4040

4141
# Ignore tensorflow and deepchecks only on Python 3.12
4242
if [ "$python_version" = "3.12" ]; then

scripts/profile-cli.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ for COMMAND in "${COMMANDS[@]}"; do
171171
if [ -n "$TIMEOUT_CMD" ]; then
172172
# Use set +e to prevent script from exiting if the command times out or fails
173173
set +e
174-
$TIMEOUT_CMD $TIMEOUT_SECONDS bash -c "$COMMAND" > /dev/null 2>&1
174+
COMMAND_OUTPUT=$($TIMEOUT_CMD $TIMEOUT_SECONDS bash -c "$COMMAND" 2>&1)
175175
EXIT_CODE=$?
176176
# Restore error handling
177177
set -e
@@ -186,13 +186,14 @@ for COMMAND in "${COMMANDS[@]}"; do
186186
COMMAND_FAILED=true
187187
ERROR_MESSAGE="Command failed on run $i (exit code: $EXIT_CODE)"
188188
echo "$ERROR_MESSAGE"
189+
echo "$COMMAND_OUTPUT"
189190
break
190191
fi
191192
else
192193
# No timeout command available, just run normally
193194
# Use set +e to prevent script from exiting if the command fails
194195
set +e
195-
eval $COMMAND > /dev/null 2>&1
196+
COMMAND_OUTPUT=$(eval $COMMAND 2>&1)
196197
EXIT_CODE=$?
197198
# Restore error handling
198199
set -e
@@ -201,6 +202,7 @@ for COMMAND in "${COMMANDS[@]}"; do
201202
COMMAND_FAILED=true
202203
ERROR_MESSAGE="Command failed on run $i (exit code: $EXIT_CODE)"
203204
echo "$ERROR_MESSAGE"
205+
echo "$COMMAND_OUTPUT"
204206
break
205207
fi
206208
fi

src/zenml/integrations/vllm/services/vllm_deployment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def run(self) -> None:
150150

151151
try:
152152
parser: argparse.ArgumentParser = make_arg_parser(
153-
FlexibleArgumentParser() # type: ignore[no-untyped-call]
153+
FlexibleArgumentParser()
154154
)
155155
# pass in empty list to get default args
156156
# otherwise it will try to get the args from sys.argv

tests/integration/examples/deepchecks/steps/data_loader.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from typing import Tuple
1515

1616
import pandas as pd
17-
from deepchecks.tabular.datasets.classification import iris
17+
from sklearn.datasets import load_iris
1818
from sklearn.model_selection import train_test_split
1919
from typing_extensions import Annotated
2020

@@ -27,9 +27,8 @@ def data_loader() -> Tuple[
2727
Annotated[pd.DataFrame, "comparison_dataset"],
2828
]:
2929
"""Load the iris dataset."""
30-
iris_df = iris.load_data(data_format="Dataframe", as_train_test=False)
31-
label_col = "target"
30+
iris = load_iris(as_frame=True)
3231
df_train, df_test = train_test_split(
33-
iris_df, stratify=iris_df[label_col], random_state=0
32+
iris["frame"], stratify=iris["target"], random_state=0
3433
)
3534
return df_train, df_test

tests/unit/utils/test_io_utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,13 @@ def test_is_remote_when_using_remote_prefix(filesystem):
212212
def test_is_remote_when_using_non_remote_prefix(filesystem):
213213
"""is_remote returns False when path doesn't start with
214214
a remote prefix"""
215+
expected_result = False
216+
217+
if filesystem in REMOTE_FS_PREFIX:
218+
expected_result = True
219+
215220
some_random_path = os.path.join(f"{filesystem}some_directory")
216-
assert io_utils.is_remote(some_random_path) is False
221+
assert io_utils.is_remote(some_random_path) is expected_result
217222

218223

219224
def test_create_file_if_not_exists(tmp_path) -> None:

0 commit comments

Comments
 (0)