Skip to content

Commit a901347

Browse files
committed
conda error. install via pip/pypi as build chain was doing before
1 parent 3da58d0 commit a901347

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
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.1"
19+
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.5" SCIKIT_LEARN_VERSION="0.22.2.post1"
2020

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

ci_scripts/install.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ popd
2424

2525
# Configure the conda environment and put it in the path using the
2626
# provided versions
27-
SCIKIT_LEARN_ARG=""
28-
if [[ ! -z $SCIKIT_LEARN_VERSION ]]; then
29-
SCIKIT_LEARN_ARG="scikit-learn=$SCIKIT_LEARN_VERSION"
30-
fi
3127
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
3329

3430
source activate testenv
3531

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
3637

3738
if [[ "$COVERAGE" == "true" ]]; then
3839
pip install coverage coveralls

0 commit comments

Comments
 (0)