Merge branch 'for-0.19.1' of github.com:jnothman/scikit-learn into fo…

…r-0.19.1
scikit-learn · Oct 3, 2017 · ba59d4b · ba59d4b
2 parents 36c311c + fecc0c4
commit ba59d4b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh
@@ -102,7 +102,8 @@ wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
    -O miniconda.sh
 chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
 export PATH="$MINICONDA_PATH/bin:$PATH"
-conda update --yes --quiet conda
+# Temporary work-around (2017-09-27)
+# conda update --yes --quiet conda
 
 # Configure the conda environment and put it in the path using the
 # provided versions

diff --git a/build_tools/travis/install.sh b/build_tools/travis/install.sh
@@ -35,7 +35,8 @@ 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 update --yes conda
+    # Temporary work-around (2017-09-27)
+    # conda update --yes conda
 
     # Configure the conda environment and put it in the path using the
     # provided versions

diff --git a/sklearn/model_selection/tests/test_split.py b/sklearn/model_selection/tests/test_split.py
@@ -845,20 +845,22 @@ def test_leave_one_p_group_out_error_on_fewer_number_of_groups():
     assert_raise_message(ValueError, "Found array with 0 sample(s)", next,
                          LeaveOneGroupOut().split(X, y, groups))
     X = y = groups = np.ones(1)
-    msg = ("The groups parameter contains fewer than 2 unique groups ([ 1.]). "
-           "LeaveOneGroupOut expects at least 2.")
+    msg = ("The groups parameter contains fewer than 2 unique groups ({}). "
+           "LeaveOneGroupOut expects at least 2.").format(groups)
     assert_raise_message(ValueError, msg, next,
                          LeaveOneGroupOut().split(X, y, groups))
     X = y = groups = np.ones(1)
     msg = ("The groups parameter contains fewer than (or equal to) n_groups "
-           "(3) numbers of unique groups ([ 1.]). LeavePGroupsOut expects "
-           "that at least n_groups + 1 (4) unique groups be present")
+           "(3) numbers of unique groups ({}). LeavePGroupsOut expects "
+           "that at least n_groups + 1 (4) unique groups "
+           "be present").format(groups)
     assert_raise_message(ValueError, msg, next,
                          LeavePGroupsOut(n_groups=3).split(X, y, groups))
     X = y = groups = np.arange(3)
     msg = ("The groups parameter contains fewer than (or equal to) n_groups "
-           "(3) numbers of unique groups ([0 1 2]). LeavePGroupsOut expects "
-           "that at least n_groups + 1 (4) unique groups be present")
+           "(3) numbers of unique groups ({}). LeavePGroupsOut expects "
+           "that at least n_groups + 1 (4) unique groups "
+           "be present").format(groups)
     assert_raise_message(ValueError, msg, next,
                          LeavePGroupsOut(n_groups=3).split(X, y, groups))