summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-05-10 11:01:08 -0600
committerCharles Harris <charlesr.harris@gmail.com>2017-05-10 11:01:08 -0600
commita3afc25089b5343b2dc7ea21add26d03fc232539 (patch)
treec9d103aad79c1f19404e1aadffcf61650ffaa211
parent14ff219a13e194c5e7995218fea3c7648eb1c875 (diff)
downloadpython-numpy-a3afc25089b5343b2dc7ea21add26d03fc232539.tar.gz
python-numpy-a3afc25089b5343b2dc7ea21add26d03fc232539.tar.bz2
python-numpy-a3afc25089b5343b2dc7ea21add26d03fc232539.zip
MAINT: Update master branch for 1.14.0 development.
Post 1.13.x branch housekeeping.
-rw-r--r--doc/release/1.14.0-notes.rst45
-rw-r--r--numpy/core/code_generators/cversions.txt1
-rw-r--r--numpy/core/include/numpy/numpyconfig.h2
-rw-r--r--numpy/core/setup_common.py1
-rw-r--r--pavement.py4
-rwxr-xr-xsetup.py2
6 files changed, 52 insertions, 3 deletions
diff --git a/doc/release/1.14.0-notes.rst b/doc/release/1.14.0-notes.rst
new file mode 100644
index 000000000..14a4e7912
--- /dev/null
+++ b/doc/release/1.14.0-notes.rst
@@ -0,0 +1,45 @@
+==========================
+NumPy 1.14.0 Release Notes
+==========================
+
+This release supports Python 2.7 and 3.4 - 3.6.
+
+
+Highlights
+==========
+
+
+New functions
+=============
+
+
+Deprecations
+============
+
+
+Future Changes
+==============
+
+
+Build System Changes
+====================
+
+
+Compatibility notes
+===================
+
+
+C API changes
+=============
+
+
+New Features
+============
+
+
+Improvements
+============
+
+
+Changes
+=======
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt
index 54140f24a..6e6547129 100644
--- a/numpy/core/code_generators/cversions.txt
+++ b/numpy/core/code_generators/cversions.txt
@@ -36,4 +36,5 @@
0x0000000a = 9b8bce614655d3eb02acddcb508203cb
# Version 11 (NumPy 1.13) Added PyArray_MapIterArrayCopyIfOverlap
+# Version 11 (NumPy 1.14) No Change
0x0000000b = edb1ba83730c650fd9bc5772a919cda7
diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h
index 701f02c6e..04a3738b9 100644
--- a/numpy/core/include/numpy/numpyconfig.h
+++ b/numpy/core/include/numpy/numpyconfig.h
@@ -34,5 +34,7 @@
#define NPY_1_10_API_VERSION 0x00000008
#define NPY_1_11_API_VERSION 0x00000008
#define NPY_1_12_API_VERSION 0x00000008
+#define NPY_1_13_API_VERSION 0x00000008
+#define NPY_1_14_API_VERSION 0x00000008
#endif
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index 1b3984063..094cd1841 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -39,6 +39,7 @@ C_ABI_VERSION = 0x01000009
# 0x0000000a - 1.11.x
# 0x0000000a - 1.12.x
# 0x0000000b - 1.13.x
+# 0x0000000b - 1.14.x
C_API_VERSION = 0x0000000b
class MismatchCAPIWarning(Warning):
diff --git a/pavement.py b/pavement.py
index 850cc43b6..2e94f6146 100644
--- a/pavement.py
+++ b/pavement.py
@@ -99,10 +99,10 @@ finally:
#-----------------------------------
# Source of the release notes
-RELEASE_NOTES = 'doc/release/1.13.0-notes.rst'
+RELEASE_NOTES = 'doc/release/1.14.0-notes.rst'
# Start/end of the log (from git)
-LOG_START = 'maintenance/1.12.x'
+LOG_START = 'maintenance/1.13.x'
LOG_END = 'master'
diff --git a/setup.py b/setup.py
index ed8b457bf..69bf59d56 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ Operating System :: MacOS
"""
MAJOR = 1
-MINOR = 13
+MINOR = 14
MICRO = 0
ISRELEASED = False
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)