Skip to content

Commit 2c45d20

Browse files
authored
MAINT: use release scikit-learn 0.20 (#481)
1 parent 1702d4d commit 2c45d20

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff 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:

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

build_tools/travis/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
numpy>=1.8.2
22
scipy>=0.13.3
3-
scikit-learn>=0.20rc1
3+
scikit-learn>=0.20

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
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']
3939
EXTRAS_REQUIRE = {
4040
'tests': [
4141
'pytest',

0 commit comments

Comments
 (0)