Merge 'v0.12.x' branch

bento.info

@@ -1,5 +1,5 @@
 Name: scikit-image
-Version: 0.12.dev0
+Version: 0.12.0
 Summary: Image processing routines for SciPy
 Url: http://scikit-image.org
 DownloadUrl: http://github.com/scikit-image/scikit-image

doc/release/release_0.12.txt

@@ -1,7 +1,7 @@
-Announcement: scikit-image 0.12.0
-=================================
+Announcement: scikit-image 0.12
+===============================
 
-We're happy to announce the release of scikit-image v0.12.0!
+We're happy to announce the release of scikit-image v0.12!
 
 scikit-image is an image processing toolbox for SciPy that includes algorithms
 for segmentation, geometric transformations, color space manipulation,
@@ -22,8 +22,8 @@ For this release, we merged over 200 pull requests with bug fixes,
 cleanups, improved documentation and new features.  Highlights
 include:
 
-
-- Parallelization framework using ``dask``:``skimage.util.apply_parallel`` 
+- 3D skeletonization (#1923)
+- Parallelization framework using ``dask``:``skimage.util.apply_parallel``
   (#1493)
 - Laplacian operator ``filters.laplace`` (#1763)
 - Synthetic 2-D and 3-D binary data with rounded blobs (#1485)
@@ -53,12 +53,10 @@ include:
 - We fixed an issue related to incorrect propagation in plateaus in
   ``segmentation.watershed``
 
-
-
 Documentation:
 
 - New organization of gallery of examples in sections
-- More frequent update of online documentation
+- More frequent (automated) updates of online documentation
 
 API Changes
 -----------
@@ -68,7 +66,7 @@ API Changes
 - The functions ``blob_dog``, ``blob_log`` and ``blob_doh`` now return
   float  arrays instead of integer arrays.
 - ``transform.integrate`` now takes lists of tuples instead of integers
-  to define the window over which to integrate. 
+  to define the window over which to integrate.
 
 Deprecations
 ------------
@@ -153,4 +151,3 @@ Contributors to this release
 - Robin Wilson
 - Olivia Wilson
 
-

doc/source/_static/docversions.js

@@ -1,4 +1,4 @@
-var versions = ['dev', '0.11.x', '0.10.x', '0.9.x', '0.8.0', '0.7.0', '0.6', '0.5', '0.4', '0.3'];
+var versions = ['dev', '0.12.x', '0.11.x', '0.10.x', '0.9.x', '0.8.0', '0.7.0', '0.6', '0.5', '0.4', '0.3'];
 
 function insert_version_links() {
     for (i = 0; i < versions.length; i++){

skimage/__init__.py

@@ -65,7 +65,7 @@ import sys
 pkg_dir = osp.abspath(osp.dirname(__file__))
 data_dir = osp.join(pkg_dir, 'data')
 
-__version__ = '0.12dev'
+__version__ = '0.12.0'
 
 try:
     imp.find_module('nose')