Merge remote-tracking branch 'origin/master' into is/9360

Author: glemaitre

.travis.yml

@@ -25,19 +25,24 @@ env:
     - MODULE=imblearn
     - OMP_NUM_THREADS=4
     - OPENBLAS_NUM_THREADS=4
-  matrix:
+
+matrix:
+  include:
     # This environment tests the using anaconda
     # Ubuntu 14.04 environment
-    - DISTRIB="ubuntu"
+    - env: DISTRIB="ubuntu"
     # Latest release
-    - DISTRIB="conda" PYTHON_VERSION="2.7"
-      NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.19.0"
-    - DISTRIB="conda" PYTHON_VERSION="3.5"
-      NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.19.0"
-    - DISTRIB="conda" PYTHON_VERSION="3.6"
-      NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.19.0"
-    - DISTRIB="conda" PYTHON_VERSION="3.6"
-      NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="master"
+    - env: DISTRIB="conda" PYTHON_VERSION="2.7"
+           NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.19.0"
+    - env: DISTRIB="conda" PYTHON_VERSION="3.5"
+           NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.19.0"
+    - env: DISTRIB="conda" PYTHON_VERSION="3.6"
+           NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.19.0"
+    - env: DISTRIB="conda" PYTHON_VERSION="3.6"
+           NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="master"
+  allow_failures:
+    - env: DISTRIB="conda" PYTHON_VERSION="3.6"
+           NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="master"
 
 install: source build_tools/travis/install.sh
 script: bash build_tools/travis/test_script.sh

README.rst

@@ -4,7 +4,7 @@
 
 .. _scikit-learn-contrib: https://github.com/scikit-learn-contrib
 
-|Landscape|_ |Travis|_ |AppVeyor|_ |Codecov|_ |CircleCI|_ |Python27|_ |Python35|_ |Pypi|_ |Gitter|_
+|Landscape|_ |Travis|_ |AppVeyor|_ |Codecov|_ |CircleCI|_ |PythonVersion|_ |Pypi|_ |Gitter|_
 
 .. |Landscape| image:: https://landscape.io/github/scikit-learn-contrib/imbalanced-learn/master/landscape.svg?style=flat
 .. _Landscape: https://landscape.io/github/scikit-learn-contrib/imbalanced-learn/master
@@ -21,11 +21,8 @@
 .. |CircleCI| image:: https://circleci.com/gh/scikit-learn-contrib/imbalanced-learn.svg?style=shield&circle-token=:circle-token
 .. _CircleCI: https://circleci.com/gh/scikit-learn-contrib/imbalanced-learn/tree/master
 
-.. |Python27| image:: https://img.shields.io/badge/python-2.7-blue.svg
-.. _Python27: https://badge.fury.io/py/scikit-learn
-
-.. |Python35| image:: https://img.shields.io/badge/python-3.5-blue.svg
-.. _Python35: https://badge.fury.io/py/scikit-learn
+.. |PythonVersion| image:: https://img.shields.io/pypi/pyversions/imbalanced-learn.svg
+.. _PythonVersion: https://img.shields.io/pypi/pyversions/imbalanced-learn.svg
 
 .. |Pypi| image:: https://badge.fury.io/py/imbalanced-learn.svg
 .. _Pypi: https://badge.fury.io/py/imbalanced-learn
@@ -74,7 +71,7 @@ install it via `pip`::
 
 The package is release also in Anaconda Cloud platform::
 
-  conda install -c glemaitre imbalanced-learn
+  conda install -c conda-forge imbalanced-learn
 
 If you prefer, you can clone it and run the setup.py file. Use the following
 commands to get a copy from GitHub and install all dependencies::

build_tools/appveyor/test.ps1

@@ -3,7 +3,7 @@
 - "cd C:\\"
 
 $installed_imblearn_folder = $(python -c "import os; os.chdir('c:/'); import imblearn;\
-print(os.path.dirname(pydicom.__file__))")
+print(os.path.dirname(imblearn.__file__))")
 echo "imblearn found in: $installed_imblearn_folder"
 
 # --pyargs argument is used to make sure we run the tests on the

build_tools/circle/build_doc.sh

@@ -93,7 +93,7 @@ source activate $CONDA_ENV_NAME
 
 conda install --yes pip numpy scipy scikit-learn pillow matplotlib sphinx \
       sphinx_rtd_theme numpydoc
-pip install sphinx-gallery
+pip install -U git+https://github.com/sphinx-gallery/sphinx-gallery.git
 
 # Build and install imbalanced-learn in dev mode
 cd "$HOME/$CIRCLE_PROJECT_REPONAME"

build_tools/circle/push_doc.sh

@@ -31,6 +31,6 @@ git config --global user.name $USERNAME
 git config --global push.default matching
 git add -f $dir/
 git commit -m "$MSG" $dir
-git push
+git push origin gh-pages
 
 echo $MSG