Skip to content

Commit 631eb82

Browse files
authored
Bump dask-ml dependency (#378)
* Bump dask-ml to 2022.1.22 * Un-xfail affected ML tests
1 parent d685432 commit 631eb82

File tree

10 files changed

+9
-15
lines changed

10 files changed

+9
-15
lines changed

continuous_integration/environment-3.7-jdk11-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- antlr4-python3-runtime>=4.9.2
88
- black=19.10b0
99
- ciso8601>=2.2.0
10-
- dask-ml>=2021.11.16
10+
- dask-ml>=2022.1.22
1111
- dask>=2021.11.1
1212
- fastapi>=0.61.1
1313
- fs>=2.4.11

continuous_integration/environment-3.7-jdk8-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- antlr4-python3-runtime>=4.9.2
88
- black=19.10b0
99
- ciso8601>=2.2.0
10-
- dask-ml>=2021.11.16
10+
- dask-ml>=2022.1.22
1111
- dask>=2021.11.1
1212
- fastapi>=0.61.1
1313
- fs>=2.4.11

continuous_integration/environment-3.8-jdk11-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- antlr4-python3-runtime>=4.9.2
88
- black=19.10b0
99
- ciso8601>=2.2.0
10-
- dask-ml>=2021.11.16
10+
- dask-ml>=2022.1.22
1111
- dask>=2021.11.1
1212
- fastapi>=0.61.1
1313
- fs>=2.4.11

continuous_integration/environment-3.8-jdk8-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- antlr4-python3-runtime>=4.9.2
88
- black=19.10b0
99
- ciso8601>=2.2.0
10-
- dask-ml>=2021.11.16
10+
- dask-ml>=2022.1.22
1111
- dask>=2021.11.1
1212
- fastapi>=0.61.1
1313
- fs>=2.4.11

continuous_integration/environment-3.9-jdk11-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- antlr4-python3-runtime>=4.9.2
88
- black=19.10b0
99
- ciso8601>=2.2.0
10-
- dask-ml>=2021.11.16
10+
- dask-ml>=2022.1.22
1111
- dask>=2021.11.1
1212
- fastapi>=0.61.1
1313
- fs>=2.4.11

continuous_integration/environment-3.9-jdk8-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- antlr4-python3-runtime>=4.9.2
88
- black=19.10b0
99
- ciso8601>=2.2.0
10-
- dask-ml>=2021.11.16
10+
- dask-ml>=2022.1.22
1111
- dask>=2021.11.1
1212
- fastapi>=0.61.1
1313
- fs>=2.4.11

docker/conda.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ uvicorn>=0.11.3
1616
pyarrow>=0.15.1
1717
prompt_toolkit>=3.0.8
1818
pygments>=2.7.1
19-
dask-ml>=2021.11.16
19+
dask-ml>=2022.1.22
2020
scikit-learn>=0.24.2
2121
intake>=0.6.0
2222
pre-commit>=2.11.1

docker/main.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN conda config --add channels conda-forge \
1616
"pyarrow>=0.15.1" \
1717
"prompt_toolkit>=3.0.8" \
1818
"pygments>=2.7.1" \
19-
"dask-ml>=2021.11.16" \
19+
"dask-ml>=2022.1.22" \
2020
"scikit-learn>=0.24.2" \
2121
"intake>=0.6.0" \
2222
&& conda clean -ay

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def run(self):
9494
"mock>=4.0.3",
9595
"sphinx>=3.2.1",
9696
"pyarrow>=0.15.1",
97-
"dask-ml>=2021.11.16",
97+
"dask-ml>=2022.1.22",
9898
"scikit-learn>=0.24.2",
9999
"intake>=0.6.0",
100100
"pre-commit",

tests/integration/test_model.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ def test_clustering_and_prediction(c, training_df):
165165
check_trained_model(c)
166166

167167

168-
@pytest.mark.xfail(
169-
reason="Upstream breakage in dask needs to be fixed by next dask-ml release"
170-
)
171168
def test_iterative_and_prediction(c, training_df):
172169
c.sql(
173170
"""
@@ -187,9 +184,6 @@ def test_iterative_and_prediction(c, training_df):
187184
check_trained_model(c)
188185

189186

190-
@pytest.mark.xfail(
191-
reason="Upstream breakage in dask needs to be fixed by next dask-ml release"
192-
)
193187
def test_show_models(c, training_df):
194188
c.sql(
195189
"""

0 commit comments

Comments
 (0)