diff --git a/doc/release/1.13.0-notes.rst b/doc/release/1.13.0-notes.rst new file mode 100644 index 000000000000..a7e4fe1a80e4 --- /dev/null +++ b/doc/release/1.13.0-notes.rst @@ -0,0 +1,49 @@ +NumPy 1.13.0 Release Notes +************************** + +This release supports Python 2.7 and 3.4 - 3.6. + +Highlights +========== + + +Dropped Support +=============== + + +Build System Changes +==================== + + +Future Changes +============== + + +Compatibility notes +=================== + +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 1de3faaa4594..48370eacd688 100644 --- a/doc/source/release.rst +++ b/doc/source/release.rst @@ -2,6 +2,7 @@ Release Notes ************* +.. include:: ../release/1.13.0-notes.rst .. include:: ../release/1.12.0-notes.rst .. include:: ../release/1.11.2-notes.rst .. include:: ../release/1.11.1-notes.rst diff --git a/pavement.py b/pavement.py index 0940d7159d57..a6072a9979c2 100644 --- a/pavement.py +++ b/pavement.py @@ -99,10 +99,10 @@ #----------------------------------- # Source of the release notes -RELEASE_NOTES = 'doc/release/1.12.0-notes.rst' +RELEASE_NOTES = 'doc/release/1.13.0-notes.rst' # Start/end of the log (from git) -LOG_START = 'maintenance/1.11.x' +LOG_START = 'maintenance/1.12.x' LOG_END = 'master' @@ -150,10 +150,7 @@ if sys.platform =="darwin": WINDOWS_PYTHON = { "3.4": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python34/python.exe"], - "3.3": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python33/python.exe"], - "3.2": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python32/python.exe"], "2.7": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python27/python.exe"], - "2.6": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"], } WINDOWS_ENV = os.environ WINDOWS_ENV["DYLD_FALLBACK_LIBRARY_PATH"] = "/usr/X11/lib:/usr/lib" @@ -161,10 +158,7 @@ elif sys.platform == "win32": WINDOWS_PYTHON = { "3.4": ["C:\Python34\python.exe"], - "3.3": ["C:\Python33\python.exe"], - "3.2": ["C:\Python32\python.exe"], "2.7": ["C:\Python27\python.exe"], - "2.6": ["C:\Python26\python.exe"], } # XXX: find out which env variable is necessary to avoid the pb with python # 2.6 and random module when importing tempfile @@ -173,10 +167,7 @@ else: WINDOWS_PYTHON = { "3.4": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python34/python.exe"], - "3.3": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python33/python.exe"], - "3.2": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python32/python.exe"], "2.7": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python27/python.exe"], - "2.6": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"], } WINDOWS_ENV = os.environ MAKENSIS = ["wine", "makensis"] diff --git a/setup.py b/setup.py index 7f2b24572b6d..b6e144562a80 100755 --- a/setup.py +++ b/setup.py @@ -51,6 +51,7 @@ Programming Language :: Python :: 3 Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 +Programming Language :: Python :: 3.6 Programming Language :: Python :: Implementation :: CPython Topic :: Software Development Topic :: Scientific/Engineering @@ -61,7 +62,7 @@ """ MAJOR = 1 -MINOR = 12 +MINOR = 13 MICRO = 0 ISRELEASED = False VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)