Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.7-jdk11-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- antlr4-python3-runtime>=4.9.2
- black=19.10b0
- ciso8601>=2.2.0
- dask-ml>=1.7.0
- dask-ml>=2021.11.16
- dask>=2021.10.0
- fastapi>=0.61.1
- fs>=2.4.11
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.7-jdk8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- antlr4-python3-runtime>=4.9.2
- black=19.10b0
- ciso8601>=2.2.0
- dask-ml>=1.7.0
- dask-ml>=2021.11.16
- dask>=2021.10.0
- fastapi>=0.61.1
- fs>=2.4.11
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.8-jdk11-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- antlr4-python3-runtime>=4.9.2
- black=19.10b0
- ciso8601>=2.2.0
- dask-ml>=1.7.0
- dask-ml>=2021.11.16
- dask>=2021.10.0
- fastapi>=0.61.1
- fs>=2.4.11
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.8-jdk8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- antlr4-python3-runtime>=4.9.2
- black=19.10b0
- ciso8601>=2.2.0
- dask-ml>=1.7.0
- dask-ml>=2021.11.16
- dask>=2021.10.0
- fastapi>=0.61.1
- fs>=2.4.11
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.9-jdk11-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- antlr4-python3-runtime>=4.9.2
- black=19.10b0
- ciso8601>=2.2.0
- dask-ml>=1.7.0
- dask-ml>=2021.11.16
- dask>=2021.10.0
- fastapi>=0.61.1
- fs>=2.4.11
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.9-jdk8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- antlr4-python3-runtime>=4.9.2
- black=19.10b0
- ciso8601>=2.2.0
- dask-ml>=1.7.0
- dask-ml>=2021.11.16
- dask>=2021.10.0
- fastapi>=0.61.1
- fs>=2.4.11
Expand Down
2 changes: 1 addition & 1 deletion docker/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ uvicorn>=0.11.3
pyarrow>=0.15.1
prompt_toolkit>=3.0.8
pygments>=2.7.1
dask-ml>=1.7.0
dask-ml>=2021.11.16
scikit-learn>=0.24.2
intake>=0.6.0
pre-commit>=2.11.1
Expand Down
2 changes: 1 addition & 1 deletion docker/main.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN conda config --add channels conda-forge \
"pyarrow>=0.15.1" \
"prompt_toolkit>=3.0.8" \
"pygments>=2.7.1" \
"dask-ml>=1.7.0" \
"dask-ml>=2021.11.16" \
"scikit-learn>=0.24.2" \
"intake>=0.6.0" \
&& conda clean -ay
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run(self):
"mock>=4.0.3",
"sphinx>=3.2.1",
"pyarrow>=0.15.1",
"dask-ml>=1.7.0",
"dask-ml>=2021.11.16",
"scikit-learn>=0.24.2",
"intake>=0.6.0",
"pre-commit",
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ def test_clustering_and_prediction(c, training_df):
check_trained_model(c)


@pytest.mark.xfail(reason="dask-ml is broken for dask==2021.11.x")
def test_iterative_and_prediction(c, training_df):
c.sql(
"""
Expand All @@ -94,7 +93,6 @@ def test_iterative_and_prediction(c, training_df):
check_trained_model(c)


@pytest.mark.xfail(reason="dask-ml is broken for dask==2021.11.x")
def test_show_models(c, training_df):
c.sql(
"""
Expand Down