Merge remote branch 'upstream/master' into f2py-assumed-shape

* upstream/master: (310 commits)
  REL: add 1.6.0 release notes.
  DEP: remove deprecated np.lib.ufunclike.log2 function.
  DOC: fix typo in test guidelines.
  DEP: remove deprecated items from ma/core.py
  DEP: remove deprecated get_numpy_include.
  DEP: remove unique1d, setmember1d and intersect1d_nu.
  DEP: remove deprecated names in fftpack.
  DEP: remove deprecated methods sync() and close() from memmap.
  DEP: Update deprecation messages in genloadtxt with a version number.
  BLD: update C API version again after Mark's renaming of functions.
  DOC: Replace 'deprecated' with 'superceded' in a few places, fix a typo.
  STY: Remove a micro-optimization to make code more clear
  DOC: Add some missing documentation, hyper-link the iterator documentation
  API: Remove PyArray_FillWithZero from public API
  API: Rename the iterator function pointer types to be more consistent with NumPy convention
  STY: Work around lack of variadic macros in debug tracing
  API: Change iterator API parameters ndim and niter from npy_intp to int
  ENH: add Intel 64-bit C compiler. Closes #960.
  TST: fix two divide-by-zero test warnings.
  BUG: Broadcast shape was backwards in error message (Ticket #1762)
  ...

1 files changed, 18 insertions, 15 deletions

diff --git a/setup.py b/setup.py
index 1083f0048..318633beb 100755
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ Intended Audience :: Developers
 License :: OSI Approved
 Programming Language :: C
 Programming Language :: Python
+Programming Language :: Python :: 3
 Topic :: Software Development
 Topic :: Scientific/Engineering
 Operating System :: Microsoft :: Windows
@@ -53,8 +54,8 @@ CLASSIFIERS         = filter(None, CLASSIFIERS.split('\n'))
 AUTHOR              = "Travis E. Oliphant, et.al."
 AUTHOR_EMAIL        = "oliphant@enthought.com"
 PLATFORMS           = ["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"]
-MAJOR               = 2
-MINOR               = 0
+MAJOR               = 1
+MINOR               = 6
 MICRO               = 0
 ISRELEASED          = False
 VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
@@ -93,6 +94,20 @@ if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 # a lot more robust than what was previously being used.
 builtins.__NUMPY_SETUP__ = True
 
+# Construct full version info. Needs to be in setup.py namespace, otherwise it
+# can't be accessed from pavement.py at build time.
+FULLVERSION = VERSION
+if not ISRELEASED:
+    if os.path.exists('.git'):
+        GIT_REVISION = git_version()
+    elif os.path.exists('numpy/version.py'):
+        # must be a source distribution, use existing version file
+        from numpy.version import git_revision as GIT_REVISION
+    else:
+        GIT_REVISION = "Unknown"
+
+    FULLVERSION += '.dev-' + GIT_REVISION[:7]
+
 def write_version_py(filename='numpy/version.py'):
     cnt = """
 # THIS FILE IS GENERATED FROM NUMPY SETUP.PY
@@ -105,22 +120,10 @@ release = %(isrelease)s
 if not release:
     version = full_version
 """
-    FULL_VERSION = VERSION
-    if not ISRELEASED:
-        if os.path.exists('.git'):
-            GIT_REVISION = git_version()
-        elif os.path.exists(filename):
-            # must be a source distribution, use existing version file
-            from numpy.version import git_revision as GIT_REVISION
-        else:
-            GIT_REVISION = "Unknown"
-
-        FULL_VERSION += '.dev-' + GIT_REVISION[:7]
-
     a = open(filename, 'w')
     try:
         a.write(cnt % {'version': VERSION,
-                       'full_version' : FULL_VERSION,
+                       'full_version' : FULLVERSION,
                        'git_revision' : GIT_REVISION,
                        'isrelease': str(ISRELEASED)})
     finally: