Skip to content

Commit 2fb7407

Browse files
committed
iter
1 parent 1956b41 commit 2fb7407

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

azure-pipelines.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- template: build_tools/azure/posix.yml
2323
parameters:
2424
name: Linux_Runs
25-
vmImage: ubuntu-18.04
25+
vmImage: ubuntu-20.04
2626
matrix:
2727
pylatest_pip_openblas_pandas:
2828
DISTRIB: 'conda-pip-latest'
@@ -44,7 +44,6 @@ jobs:
4444
# i.e. numpy 1.13.3 and scipy 0.19
4545
py36_ubuntu_atlas:
4646
DISTRIB: 'ubuntu'
47-
PYTHON_VERSION: '3.6'
4847
JOBLIB_VERSION: '*'
4948
pylatest_conda_pandas_keras:
5049
DISTRIB: 'conda'
@@ -64,6 +63,11 @@ jobs:
6463
TENSORFLOW_VERSION: '*'
6564
COVERAGE: 'true'
6665
TEST_DOCSTRINGS: 'true'
66+
sklearn_0_24_conda:
67+
DISTRIB: 'conda'
68+
PYTHON_VERSION: '3.7'
69+
SKLEARN_VERSION: '0.24.2'
70+
INSTALL_MKL: 'true'
6771

6872
- template: build_tools/azure/posix-32.yml
6973
parameters:

build_tools/azure/install.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@ if [[ "$DISTRIB" == "conda" ]]; then
3232
fi
3333

3434
make_conda $TO_INSTALL
35-
python -m pip install scikit-learn
3635

3736
TO_INSTALL=""
3837

38+
if [[ -n "$SKLEARN_VERSION" ]]; then
39+
TO_INSTALL="$TO_INSTALL scikit-learn=$SKLEARN_VERSION"
40+
else
41+
TO_INSTALL="$TO_INSTALL scikit-learn"
42+
fi
43+
3944
if [[ -n "$PANDAS_VERSION" ]]; then
4045
TO_INSTALL="$TO_INSTALL pandas=$PANDAS_VERSION"
4146
fi

0 commit comments

Comments
 (0)