summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-12-08 13:26:13 -0700
committerGitHub <noreply@github.com>2017-12-08 13:26:13 -0700
commit5c16f535e7515c2394b19cc6778ad9b5ae24d729 (patch)
treeafbbf9bf3be21f5656a52c1eaae80125ed3f4861
parent5f01e54b20e38d483e8bab31bf5f953a860fe8d3 (diff)
parentc97c69f12fe629b77272b4420e53fb38c8ca9fe1 (diff)
downloadnumpy-5c16f535e7515c2394b19cc6778ad9b5ae24d729.tar.gz
Merge pull request #10178 from charris/prepare-1.15-dev
MAINT: Prepare master for 1.15 development.
-rw-r--r--doc/release/1.15.0-notes.rst40
-rw-r--r--doc/source/release.rst1
-rw-r--r--pavement.py4
3 files changed, 43 insertions, 2 deletions
diff --git a/doc/release/1.15.0-notes.rst b/doc/release/1.15.0-notes.rst
new file mode 100644
index 000000000..15d34e9fc
--- /dev/null
+++ b/doc/release/1.15.0-notes.rst
@@ -0,0 +1,40 @@
+==========================
+NumPy 1.15.0 Release Notes
+==========================
+
+
+Highlights
+==========
+
+
+New functions
+=============
+
+
+Deprecations
+============
+
+
+Future Changes
+==============
+
+
+Compatibility notes
+===================
+
+
+C API changes
+=============
+
+
+New Features
+============
+
+
+Improvements
+============
+
+
+Changes
+=======
+
diff --git a/doc/source/release.rst b/doc/source/release.rst
index 953c2e533..977369a7c 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -2,6 +2,7 @@
Release Notes
*************
+.. include:: ../release/1.15.0-notes.rst
.. include:: ../release/1.14.0-notes.rst
.. include:: ../release/1.13.3-notes.rst
.. include:: ../release/1.13.2-notes.rst
diff --git a/pavement.py b/pavement.py
index 780993a38..0065c142b 100644
--- a/pavement.py
+++ b/pavement.py
@@ -95,10 +95,10 @@ finally:
#-----------------------------------
# Source of the release notes
-RELEASE_NOTES = 'doc/release/1.14.0-notes.rst'
+RELEASE_NOTES = 'doc/release/1.15.0-notes.rst'
# Start/end of the log (from git)
-LOG_START = 'maintenance/1.13.x'
+LOG_START = 'maintenance/1.14.x'
LOG_END = 'master'