scikit-learn · amueller · Jun 20, 2017 · Jun 19, 2017 · Jun 19, 2017 · Jun 20, 2017
diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh
@@ -49,7 +49,7 @@ popd
 # Using sphinx 1.4 for now until sphinx-gallery has a fix for sphinx 1.5
 # See https://github.com/sphinx-gallery/sphinx-gallery/pull/178 for more details
 conda create -n testenv --yes --quiet python numpy scipy \
-  cython nose coverage matplotlib sphinx=1.4 pillow
+  cython nose coverage matplotlib=1.5.3 sphinx=1.4 pillow docutils=0.12
 source activate testenv
 
 # Build and install scikit-learn in dev mode

diff --git a/doc/sphinxext/sphinx_gallery/gen_gallery.py b/doc/sphinxext/sphinx_gallery/gen_gallery.py
@@ -135,7 +135,8 @@ def setup(app):
     app.add_config_value('sphinx_gallery_conf', gallery_conf, 'html')
     app.add_stylesheet('gallery.css')
 
-    if 'sphinx.ext.autodoc' in app._extensions:
+    extensions_attr = '_extensions' if hasattr(app, '_extensions') else 'extensions'
+    if 'sphinx.ext.autodoc' in getattr(app, extensions_attr):
         app.connect('autodoc-process-docstring', touch_empty_backreferences)
 
     app.connect('builder-inited', generate_gallery_rst)

diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -5,6 +5,31 @@
 Release history
 ===============
 
+.. _changes_0_18_2:
+
+Version 0.18.2
+==============
+
+**June 20, 2017**
+
+.. topic:: Last release with Python 2.6 support
+
+    Scikit-learn 0.18 is the last major release of scikit-learn to support Python 2.6.
+    Later versions of scikit-learn will require Python 2.7 or above.
+
+
+Changelog
+---------
+    - Fixes for compatibility with NumPy 1.13.0: :issue:`7946` :issue:`8355` by `Loic Esteve`_.
+
+    - Minor compatibility changes in the examples :issue:`9010` :issue:`8040` :issue:`9149`.
+
+
+Code Contributors
+-----------------
+Aman Dalmia, Loic Esteve, Nate Guerin, Sergei Lebedev
+
+
 .. _changes_0_18_1:
 
 Version 0.18.1

diff --git a/examples/applications/plot_stock_market.py b/examples/applications/plot_stock_market.py
@@ -76,6 +76,7 @@
 ###############################################################################
 # Retrieve the data from Internet
 
+
 def quotes_historical_google(symbol, date1, date2):
     """Get the historical data from Google finance.
 
@@ -101,15 +102,15 @@ def quotes_historical_google(symbol, date1, date2):
         'output': 'csv'
     })
     url = 'http://www.google.com/finance/historical?' + params
-    with urlopen(url) as response:
-        dtype = {
-            'names': ['date', 'open', 'high', 'low', 'close', 'volume'],
-            'formats': ['object', 'f4', 'f4', 'f4', 'f4', 'f4']
-        }
-        converters = {0: lambda s: datet
8000
ime.strptime(s.decode(), '%d-%b-%y')}
-        return np.genfromtxt(response, delimiter=',', skip_header=1,
-                             dtype=dtype, converters=converters,
-                             missing_values='-', filling_values=-1)
+    response = urlopen(url)
+    dtype = {
+        'names': ['date', 'open', 'high', 'low', 'close', 'volume'],
+        'formats': ['object', 'f4', 'f4', 'f4', 'f4', 'f4']
+    }
+    converters = {0: lambda s: datetime.strptime(s.decode(), '%d-%b-%y')}
+    return np.genfromtxt(response, delimiter=',', skip_header=1,
+                         dtype=dtype, converters=converters,
+                         missing_values='-', filling_values=-1)
 
 
 # Choose a time period reasonably calm (not too long ago so that we get
@@ -181,8 +182,8 @@ def quotes_historical_google(symbol, date1, date2):
     quotes_historical_google(symbol, d1, d2) for symbol in symbols
 ]
 
-close_prices = np.stack([q['close'] for q in quotes])
-open_prices = np.stack([q['open'] for q in quotes])
+close_prices = np.vstack([q['close'] for q in quotes])
+open_prices = np.vstack([q['open'] for q in quotes])
 
 # The daily variations of the quotes are what carry most information
 variation = close_prices - open_prices
@@ -239,7 +240,7 @@ def quotes_historical_google(symbol, date1, date2):
 
 # Plot the edges
 start_idx, end_idx = np.where(non_zero)
-#a sequence of (*line0*, *line1*, *line2*), where::
+# a sequence of (*line0*, *line1*, *line2*), where::
 #            linen = (x0, y0), (x1, y1), ... (xm, ym)
 segments = [[embedding[:, start], embedding[:, stop]]
             for start, stop in zip(start_idx, end_idx)]

diff --git a/sklearn/__init__.py b/sklearn/__init__.py
@@ -37,7 +37,7 @@
 # Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
 # 'X.Y.dev0' is the canonical version of 'X.Y.dev'
 #
-__version__ = '0.18.1'
+__version__ = '0.18.2'
 
 
 try: