File tree Expand file tree Collapse file tree 5 files changed +8
-8
lines changed
Expand file tree Collapse file tree 5 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -33,11 +33,11 @@ matrix:
3333 - env : DISTRIB="ubuntu"
3434 # Latest release
3535 - env : DISTRIB="conda" PYTHON_VERSION="2.7"
36- NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.20rc "
36+ NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.20 "
3737 - env : DISTRIB="conda" PYTHON_VERSION="3.6"
38- NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.20rc "
38+ NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.20 "
3939 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
40- NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.20rc "
40+ NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.20 "
4141 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
4242 NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master"
4343 allow_failures :
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ install:
4141 - conda create -n testenv --yes python=%PYTHON_VERSION% pip
4242 - activate testenv
4343 - conda install scipy numpy -y -q
44- - pip install --pre scikit-learn
44+ - conda install scikit-learn -y -q
4545 - conda install %OPTIONAL_DEP% -y -q
4646 - conda install pytest pytest-cov -y -q
4747 - pip install codecov
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
5252 conda install --yes cython
5353 pip install -U git+https://github.com/scikit-learn/scikit-learn.git
5454 else
55- conda install --yes scikit-learn=$SKLEARN_VERSION -c conda-forge/label/rc -c conda-forge
55+ conda install --yes scikit-learn=$SKLEARN_VERSION
5656 fi
5757
5858 conda install --yes pytest pytest-cov
@@ -67,7 +67,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
6767 virtualenv --system-site-packages testvenv
6868 source testvenv/bin/activate
6969
70- pip install --pre scikit-learn
70+ pip install scikit-learn
7171 pip install pandas keras tensorflow
7272 pip install pytest pytest-cov codecov sphinx numpydoc
7373
Original file line number Diff line number Diff line change 11numpy >= 1.8.2
22scipy >= 0.13.3
3- scikit-learn >= 0.20rc1
3+ scikit-learn >= 0.20
Original file line number Diff line number Diff line change 3535 'Programming Language :: Python :: 2.7' ,
3636 'Programming Language :: Python :: 3.6' ,
3737 'Programming Language :: Python :: 3.7' ]
38- INSTALL_REQUIRES = ['numpy>=1.8.2' , 'scipy>=0.13.3' , 'scikit-learn>=0.20rc1 ' ]
38+ INSTALL_REQUIRES = ['numpy>=1.8.2' , 'scipy>=0.13.3' , 'scikit-learn>=0.20 ' ]
3939EXTRAS_REQUIRE = {
4040 'tests' : [
4141 'pytest' ,
You can’t perform that action at this time.
0 commit comments