File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 16
16
- DISTRIB="conda" PYTHON_VERSION="3.7"
17
17
NUMPY_VERSION="1.15.3" SCIPY_VERSION="1.2.1" CYTHON_VERSION="0.28.5"
18
18
- DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true"
19
- NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.5" SCIKIT_LEARN_VERSION="0.22.1 "
19
+ NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.5" SCIKIT_LEARN_VERSION="0.22.2.post1 "
20
20
21
21
install : source ci_scripts/install.sh
22
22
script : bash ci_scripts/test.sh
Original file line number Diff line number Diff line change 24
24
25
25
# Configure the conda environment and put it in the path using the
26
26
# provided versions
27
- SCIKIT_LEARN_ARG=" "
28
- if [[ ! -z $SCIKIT_LEARN_VERSION ]]; then
29
- SCIKIT_LEARN_ARG=" scikit-learn=$SCIKIT_LEARN_VERSION "
30
- fi
31
27
conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
32
- numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION $SCIKIT_LEARN_ARG matplotlib pandas networkx
28
+ numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION matplotlib pandas networkx
33
29
34
30
source activate testenv
35
31
32
+ if [[ ! -z $SCIKIT_LEARN_VERSION ]]; then
33
+ # can't install via conda due to a package conflict, but we have been
34
+ # allowing pip to install to this env during our dependency process.
35
+ pip install scikit-learn==$SCIKIT_LEARN_VERSION
36
+ fi
36
37
37
38
if [[ " $COVERAGE " == " true" ]]; then
38
39
pip install coverage coveralls
You can’t perform that action at this time.
0 commit comments