Skip to content

Commit e71d94b

Browse files
committed
it may have been this easy
1 parent a901347 commit e71d94b

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
- DISTRIB="conda" PYTHON_VERSION="3.7"
1717
NUMPY_VERSION="1.15.3" SCIPY_VERSION="1.2.1" CYTHON_VERSION="0.28.5"
1818
- 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.2.post1"
19+
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.5"
2020

2121
install: source ci_scripts/install.sh
2222
script: bash ci_scripts/test.sh

ci_scripts/install.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,10 @@ popd
2525
# Configure the conda environment and put it in the path using the
2626
# provided versions
2727
conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
28-
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION matplotlib pandas networkx
28+
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION scikit-learn matplotlib pandas networkx
2929

3030
source activate testenv
3131

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
37-
3832
if [[ "$COVERAGE" == "true" ]]; then
3933
pip install coverage coveralls
4034
fi

0 commit comments

Comments
 (0)