REL: Update master branch after 1.12.x branch has been made.

* Drop testing of Python 2.6, 3.2, and 3.3
* Create 1.12.0-notes.rst and add to source/documentation.
* Update pavement.py to use 1.10.x as LOG_START
* Update version numpy in setup.py

5 files changed, 70 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index 3066cbbaa..c14994d0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,7 @@ env:
                ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
 
 python:
-  - 2.6
   - 2.7
-  - 3.2
-  - 3.3
   - 3.4
   - 3.5
 matrix:
diff --git a/doc/release/1.12.0-notes.rst b/doc/release/1.12.0-notes.rst
new file mode 100644
index 000000000..ee4e2d24a
--- /dev/null
+++ b/doc/release/1.12.0-notes.rst
@@ -0,0 +1,66 @@
+NumPy 1.12.0 Release Notes
+**************************
+
+This release supports Python 2.7 and 3.4 - 3.5.
+
+Highlights
+==========
+
+
+Dropped Support
+===============
+
+* Support for Python 2.6, 3.2, and 3.3 has been dropped.
+
+
+Future Changes
+==============
+
+* In 1.13 NAT will always compare False except for ``NAT != NAT``,
+  which will be True.  In short, NAT will behave like NaN
+
+
+Compatibility notes
+===================
+
+Relaxed stride checking is the default
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This will have some impact on code that assumed that ``F_CONTIGUOUS`` and
+``C_CONTIGUOUS`` were mutually exclusive and could be set to determine the
+default order for arrays that are now both.
+
+``MaskedArray`` takes view of data **and** mask when slicing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+XXX
+
+
+DeprecationWarning to error
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+FutureWarning to changed behavior
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+C API
+~~~~~
+
+
+New Features
+============
+
+
+
+Improvements
+============
+
+
+
+Changes
+=======
+
+Deprecations
+============
+
diff --git a/doc/source/release.rst b/doc/source/release.rst
index 6da61763f..1801b2067 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -2,6 +2,7 @@
 Release Notes
 *************
 
+.. include:: ../release/1.12.0-notes.rst
 .. include:: ../release/1.11.0-notes.rst
 .. include:: ../release/1.10.4-notes.rst
 .. include:: ../release/1.10.3-notes.rst
diff --git a/pavement.py b/pavement.py
index 01328442e..d02cc48c5 100644
--- a/pavement.py
+++ b/pavement.py
@@ -99,10 +99,10 @@ finally:
 #-----------------------------------
 
 # Source of the release notes
-RELEASE_NOTES = 'doc/release/1.11.0-notes.rst'
+RELEASE_NOTES = 'doc/release/1.12.0-notes.rst'
 
 # Start/end of the log (from git)
-LOG_START = 'v1.10.0'
+LOG_START = 'maintenance/1.11.x'
 LOG_END = 'master'
 
 
diff --git a/setup.py b/setup.py
index ded914b11..a7f66a03d 100755
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ Operating System :: MacOS
 """
 
 MAJOR               = 1
-MINOR               = 11
+MINOR               = 12
 MICRO               = 0
 ISRELEASED          = False
 VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)