Fix CI and legends

circle.yml

@@ -16,30 +16,24 @@ machine:
 dependencies:
 
   # Various dependencies
-  # pre:
-  #   - sudo -E apt-get -yq remove texlive-binaries --purge
-  #   - sudo apt-get update
-  #   - sudo apt-get install libatlas-dev libatlas3gf-base
-  #   - sudo apt-get install build-essential python-dev python-setuptools
-  #   # install numpy first as it is a compile time dependency for other packages
-  #   - pip install --upgrade numpy
-  #   - pip install --upgrade scipy matplotlib setuptools nose coverage sphinx pillow sphinx_rtd_theme
-  #   - git clone git@github.com:glemaitre/sphinx-gallery.git
-  #   - cd sphinx-gallery
-  #   - python setup.py develop
-  #   - cd ../
-  #   # Installing required packages for `make -C doc check command` to work.
-  #   - sudo -E apt-get -yq update
-  #   - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install dvipng texlive-latex-base texlive-latex-extra
-  #   - pip install --upgrade cython numpydoc
-  #   - pip install --upgrade scikit-learn
-  #   - pip install --upgrade seaborn
+  pre:
+    - sudo -E apt-get -yq remove texlive-binaries --purge
+    - sudo apt-get update
+    - sudo apt-get install libatlas-dev libatlas3gf-base
+    - sudo apt-get install build-essential python-dev python-setuptools
+    # install numpy first as it is a compile time dependency for other packages
+    - pip install --upgrade numpy
+    - pip install --upgrade scipy matplotlib setuptools nose coverage sphinx pillow sphinx-gallery sphinx_rtd_theme
+    # Installing required packages for `make -C doc check command` to work.
+    - sudo -E apt-get -yq update
+    - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install dvipng texlive-latex-base texlive-latex-extra
+    - pip install --upgrade cython numpydoc
+    - pip install --upgrade scikit-learn
+    - pip install --upgrade seaborn
 
   # The --user is needed to let sphinx see the source and the binaries
   # The pipefail is requested to propagate exit code
   override:
-    - ./build_tools/circle/build_doc.sh:
-        timeout: 3600
     - python setup.py clean
     - python setup.py develop
     - set -o pipefail && cd doc && make html 2>&1 | tee ~/log.txt

examples/over-sampling/plot_adasyn.py

@@ -58,6 +58,6 @@
     ax.set_xlim([-6, 8])
     ax.set_ylim([-6, 6])
 
-plt.figlegend((c0, c1), ('Class #0', 'Class #1'), loc='lower center',
+plt.figlegend((c0, c1), ('Class #0', 'Class #1'), loc='upper center',
               ncol=2, labelspacing=0.)
 plt.show()

examples/over-sampling/plot_random_over_sampling.py

@@ -57,6 +57,6 @@
     ax.set_xlim([-6, 8])
     ax.set_ylim([-6, 6])
 
-plt.figlegend((c0, c1), ('Class #0', 'Class #1'), loc='lower center',
+plt.figlegend((c0, c1), ('Class #0', 'Class #1'), loc='upper center',
               ncol=2, labelspacing=0.)
 plt.show()

examples/under-sampling/plot_cluster_centroids.py

@@ -57,6 +57,6 @@
     ax.set_xlim([-6, 8])
     ax.set_ylim([-6, 6])
 
-plt.figlegend((c0, c1), ('Class #0', 'Class #1'), loc='lower center',
+plt.figlegend((c0, c1), ('Class #0', 'Class #1'), loc='upper center',
               ncol=2, labelspacing=0.)
 plt.show()

examples/under-sampling/plot_enn_renn_allknn.py

@@ -93,5 +93,6 @@ def plot_resampling(ax, X, y, title):
 plot_resampling(ax4, X_res_vis, y_resampled, 'All-KNN - ' + reduction_str)
 
 plt.figlegend((c0, c1, c3), ('Class #0', 'Class #1', 'Removed samples'),
-              loc='lower center', ncol=3, labelspacing=0.)
+              loc='upper center', ncol=3, labelspacing=0.)
+plt.tight_layout(pad=2)
 plt.show()

examples/under-sampling/plot_instance_hardness_threshold.py

@@ -66,5 +66,6 @@ def plot_resampling(ax, X, y, title):
                         alpha=.2, label='Removed samples')
 
 plt.figlegend((c0, c1, c3), ('Class #0', 'Class #1', 'Removed samples'),
-              loc='lower center', ncol=3, labelspacing=0.)
+              loc='upper center', ncol=3, labelspacing=0.)
+plt.tight_layout(pad=2)
 plt.show()

examples/under-sampling/plot_nearmiss.py

@@ -75,5 +75,6 @@ def plot_resampling(ax, X, y, title):
                     'Nearmiss {}'.format(version[i]))
 
 plt.figlegend((c0, c1, c3), ('Class #0', 'Class #1', 'Removed samples'),
-              loc='lower center', ncol=3, labelspacing=0.)
+              loc='upper center', ncol=3, labelspacing=0.)
+plt.tight_layout(pad=2)
 plt.show()