Merge branch '0.25.x'

CHANGES.rst

@@ -2,6 +2,25 @@
 Cython Changelog
 ================
 
+0.25.1 (2016-10-26?)
+===================
+
+Bugs fixed
+----------
+
+* Fixes a bug with ``isinstance(o, Exception)`` (Github issue #1496).
+
+* Fixes bug with ``cython.view.array`` missing utility code in some cases
+  (Github issue #1502).
+
+Other changes
+-------------
+
+* The distutils extension ``Cython.Distutils.build_ext`` has been reverted,
+  temporarily, to be ``old_build_ext`` to give projects time to migrate.
+  The new build_ext is available as ``new_build_ext``.
+
+
 0.25 (2016-10-25)
 =================
 

Cython/Distutils/build_ext.py

@@ -11,10 +11,13 @@ else:
     from distutils.command.build_ext import build_ext as _build_ext
 
 
-class build_ext(_build_ext, object):
+class new_build_ext(_build_ext, object):
     def finalize_options(self):
         if self.distribution.ext_modules:
             from Cython.Build.Dependencies import cythonize
             self.distribution.ext_modules[:] = cythonize(
                 self.distribution.ext_modules)
         super(build_ext, self).finalize_options()
+
+# This will become new_build_ext in the future.
+from Cython.Distutils.old_build_ext as build_ext

Cython/Distutils/old_build_ext.py

@@ -21,10 +21,11 @@ try:
     frames = inspect.getouterframes(inspect.currentframe(), 2)
     from_setuptools = 'setuptools/extension.py' in frames[2][1]
     from_pyximport = 'pyximport/pyxbuild.py' in frames[1][1]
+    from_cy_buildext = 'Cython/Distutils/build_ext.py' in frames[1][1]
 except Exception:
-    from_setuptools = from_pyximport = False
+    from_setuptools = from_pyximport = from_cy_buildext = False
 
-if not from_setuptools and not from_pyximport:
+if not from_setuptools and not from_pyximport and not from_cy_buildext:
     warnings.warn(
         "Cython.Distutils.old_build_ext does not properly handle dependencies "
         "and is deprecated.")

Cython/Shadow.py

 # cython.* namespace for pure mode.
 from __future__ import absolute_import
 
-__version__ = "0.25"
+__version__ = "0.25.1b0"
 
 try:
     from __builtin__ import basestring