Merge branch 'master' of https://github.com/scikit-learn-contrib/imbalanced-learn into spider

Author: MattEding

build_tools/travis/install.sh

@@ -28,7 +28,10 @@ if [[ "$DISTRIB" == "conda" ]]; then
     MINICONDA_PATH=/home/travis/miniconda
     chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
     export PATH=$MINICONDA_PATH/bin:$PATH
-    conda install --yes conda=4.6
+    conda config --set always_yes yes --set changeps1 no
+    conda install conda=4.6
+    conda update -q conda
+    conda info -a
 
     # Configure the conda environment and put it in the path using the
     # provided versions

imblearn/metrics/_classification.py

@@ -368,10 +368,9 @@ def specificity_score(y_true,
                       sample_weight=None):
     """Compute the specificity
 
-    The specificity is the ratio ``tp / (tp + fn)`` where ``tp`` is the number
-    of true positives and ``fn`` the number of false negatives. The specificity
-    is intuitively the ability of the classifier to find all the positive
-    samples.
+    The specificity is the ratio ``tn / (tn + fp)`` where ``tn`` is the number
+    of true negatives and ``fn`` the number of false negatives. The specificity
+    quantifies the ability to avoid false positives_[1].
 
     The best value is 1 and the worst value is 0.
 

imblearn/over_sampling/_smote.py

@@ -1290,7 +1290,7 @@ def _sample(self, X, y):
             if not valid_clusters:
                 raise RuntimeError(
                     "No clusters found with sufficient samples of "
-                    "class {}. Try lowering the cluster_balance_threshold or "
+                    "class {}. Try lowering the cluster_balance_threshold "
                     "or increasing the number of "
                     "clusters.".format(class_sample))
 

imblearn/utils/_show_versions.py

@@ -59,51 +59,38 @@ def show_versions(github=False):
         If true, wrap system info with GitHub markup.
     """
 
-    from sklearn.utils._show_versions import (
-        _get_sys_info,
-        _get_blas_info,
-    )
+    from sklearn.utils._show_versions import _get_sys_info
 
     _sys_info = _get_sys_info()
-    _blas_info = _get_blas_info()
     _deps_info = _get_deps_info()
     _github_markup = (
         "<details>"
-        "<summary>System, BLAS, and Dependencies</summary>\n\n"
+        "<summary>System, Dependency Information</summary>\n\n"
         "**System Information**\n\n"
         "{0}\n"
-        "**BLAS**\n\n"
-        "{1}\n"
         "**Python Dependencies**\n\n"
-        "{2}\n"
+        "{1}\n"
         "</details>"
     )
 
     if github:
 
         _sys_markup = ""
-        _blas_markup = ""
         _deps_markup = ""
 
         for k, stat in _sys_info.items():
             _sys_markup += "* {k:<10}: `{stat}`\n".format(k=k, stat=stat)
-        for k, stat in _blas_info.items():
-            _blas_markup += "* {k:<10}: `{stat}`\n".format(k=k, stat=stat)
         for k, stat in _deps_info.items():
             _deps_markup += "* {k:<10}: `{stat}`\n".format(k=k, stat=stat)
 
-        print(_github_markup.format(_sys_markup, _blas_markup, _deps_markup))
+        print(_github_markup.format(_sys_markup, _deps_markup))
 
     else:
 
         print("\nSystem:")
         for k, stat in _sys_info.items():
             print("{k:>11}: {stat}".format(k=k, stat=stat))
 
-        print("\nBLAS:")
-        for k, stat in _blas_info.items():
-            print("{k:>11}: {stat}".format(k=k, stat=stat))
-
         print("\nPython dependencies:")
         for k, stat in _deps_info.items():
             print("{k:>11}: {stat}".format(k=k, stat=stat))

imblearn/utils/tests/test_show_versions.py

@@ -24,9 +24,6 @@ def test_show_versions_default(capsys):
     assert "python" in out
     assert "executable" in out
     assert "machine" in out
-    assert "macros" in out
-    assert "lib_dirs" in out
-    assert "cblas_libs" in out
     assert "pip" in out
     assert "setuptools" in out
     assert "imblearn" in out
@@ -42,15 +39,11 @@ def test_show_versions_default(capsys):
 def test_show_versions_github(capsys):
     show_versions(github=True)
     out, err = capsys.readouterr()
-    assert "<details><summary>System, BLAS, and Dependencies</summary>" in out
+    assert "<details><summary>System, Dependency Information</summary>" in out
     assert "**System Information**" in out
     assert "* python" in out
     assert "* executable" in out
     assert "* machine" in out
-    assert "**BLAS**" in out
-    assert "* macros" in out
-    assert "* lib_dirs" in out
-    assert "* cblas_libs" in out
     assert "**Python Dependencies**" in out
     assert "* pip" in out
     assert "* setuptools" in out