Merge pull request #13874 from charris/prepare-1.18-development

MAINT: Prepare master for 1.18.0 development.

4 files changed, 46 insertions, 2 deletions

diff --git a/doc/release/1.18.0-notes.rst b/doc/release/1.18.0-notes.rst
new file mode 100644
index 000000000..f20d5e3fe
--- /dev/null
+++ b/doc/release/1.18.0-notes.rst
@@ -0,0 +1,43 @@
+==========================
+NumPy 1.18.0 Release Notes
+==========================
+
+
+Highlights
+==========
+
+
+New functions
+=============
+
+
+Deprecations
+============
+
+
+Future Changes
+==============
+
+
+Expired deprecations
+====================
+
+
+Compatibility notes
+===================
+
+
+C API changes
+=============
+
+
+New Features
+============
+
+
+Improvements
+============
+
+
+Changes
+=======
diff --git a/doc/source/release.rst b/doc/source/release.rst
index f8d83726f..8dfb8db1d 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -2,6 +2,7 @@
 Release Notes
 *************
 
+.. include:: ../release/1.18.0-notes.rst
 .. include:: ../release/1.17.0-notes.rst
 .. include:: ../release/1.16.4-notes.rst
 .. include:: ../release/1.16.3-notes.rst
diff --git a/pavement.py b/pavement.py
index 2a5225f71..c26717988 100644
--- a/pavement.py
+++ b/pavement.py
@@ -42,7 +42,7 @@ from paver.easy import Bunch, options, task, sh
 #-----------------------------------
 
 # Path to the release notes
-RELEASE_NOTES = 'doc/release/1.17.0-notes.rst'
+RELEASE_NOTES = 'doc/release/1.18.0-notes.rst'
 
 
 #-------------------------------------------------------
diff --git a/setup.py b/setup.py
index 7dd87da8a..11e16413a 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ Operating System :: MacOS
 """
 
 MAJOR               = 1
-MINOR               = 17
+MINOR               = 18
 MICRO               = 0
 ISRELEASED          = False
 VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)