Skip to content

Commit 4d1bb00

Browse files
committed
MAINT make joblib a dependence
1 parent 2fa0596 commit 4d1bb00

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The dependency requirements are based on the last scikit-learn release:
5858
* scipy(>=0.17)
5959
* numpy(>=1.11)
6060
* scikit-learn(>=0.21)
61+
* joblib(>=0.11)
6162
* keras 2 (optional)
6263
* tensorflow (optional)
6364

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ install:
3131
- conda create -n testenv --yes python=%PYTHON_VERSION% pip
3232
- activate testenv
3333
- conda install scipy numpy -y -q
34-
- conda install scikit-learn -y -q
34+
- conda install scikit-learn joblib -y -q
3535
- conda install %OPTIONAL_DEP% -y -q
3636
- conda install pytest pytest-cov -y -q
3737
- pip install codecov

build_tools/circle/build_doc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ conda create -n $CONDA_ENV_NAME --yes --quiet python=3.6
9292
source activate $CONDA_ENV_NAME
9393

9494
conda install --yes pip numpy scipy pillow matplotlib sphinx \
95-
sphinx_rtd_theme numpydoc pandas keras
95+
sphinx_rtd_theme numpydoc pandas keras joblib
9696
pip install --pre scikit-learn
9797
pip install -U git+https://github.com/sphinx-gallery/sphinx-gallery.git
9898

build_tools/travis/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
3939
conda create -n testenv --yes python=$PYTHON_VERSION pip
4040
source activate testenv
4141
conda install --yes numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION
42+
conda install --yes joblib
4243

4344
if [[ $PYTHON_VERSION == "3.6" ]]; then
4445
# Tensorflow is not available in Python 3.7 yet.
@@ -67,7 +68,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
6768
virtualenv --system-site-packages --python=python3 testvenv
6869
source testvenv/bin/activate
6970

70-
pip3 install scikit-learn
71+
pip3 install scikit-learn joblib
7172
pip3 install pandas keras tensorflow
7273
pip3 install pytest pytest-cov codecov sphinx numpydoc
7374

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@
3434
'Operating System :: MacOS',
3535
'Programming Language :: Python :: 3.6',
3636
'Programming Language :: Python :: 3.7']
37-
INSTALL_REQUIRES = ['numpy>=1.11', 'scipy>=0.17', 'scikit-learn>=0.21']
37+
INSTALL_REQUIRES = [
38+
'numpy>=1.11',
39+
'scipy>=0.17',
40+
'scikit-learn>=0.21',
41+
'joblib>=0.11'
42+
]
3843
EXTRAS_REQUIRE = {
3944
'tests': [
4045
'pytest',

0 commit comments

Comments
 (0)