diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-03 12:22:19 -0400 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-03 12:22:19 -0400 |
commit | b92510e4fc3a150e48d353b8e2b29bf5875f5c3d (patch) | |
tree | e40d97053ea55f9de6b45070a326ae09f9b0b9a9 | |
parent | 03164d2d819f9b38e1c684d6d9e128f11867dc3c (diff) | |
parent | b06dbc15d9db0e224d338c84ac98a925a7945d4c (diff) | |
download | numpy-b92510e4fc3a150e48d353b8e2b29bf5875f5c3d.tar.gz |
Merge pull request #6145 from charris/init-1.11.0
MAINT: Init master branch for 1.11.0 development.
-rw-r--r-- | bento.info | 2 | ||||
-rw-r--r-- | doc/release/1.10.0-notes.rst | 2 | ||||
-rw-r--r-- | doc/release/1.11.0-notes.rst | 35 | ||||
-rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 1 | ||||
-rw-r--r-- | pavement.py | 4 | ||||
-rwxr-xr-x | setup.py | 2 |
6 files changed, 41 insertions, 5 deletions
diff --git a/bento.info b/bento.info index 29bde06cc..adf07f20d 100644 --- a/bento.info +++ b/bento.info @@ -1,5 +1,5 @@ Name: numpy -Version: 1.9.0 +Version: 1.10.0 Summary: NumPy: array processing for numbers, strings, records, and objects. Url: http://www.numpy.org DownloadUrl: http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103 diff --git a/doc/release/1.10.0-notes.rst b/doc/release/1.10.0-notes.rst index 1d98195a8..404e53cd1 100644 --- a/doc/release/1.10.0-notes.rst +++ b/doc/release/1.10.0-notes.rst @@ -1,7 +1,7 @@ NumPy 1.10.0 Release Notes ************************** -This release supports Python 2.6 - 2.7 and 3.2 - 3.4. +This release supports Python 2.6 - 2.7 and 3.2 - 3.5. Highlights diff --git a/doc/release/1.11.0-notes.rst b/doc/release/1.11.0-notes.rst new file mode 100644 index 000000000..7bb0c6fda --- /dev/null +++ b/doc/release/1.11.0-notes.rst @@ -0,0 +1,35 @@ +NumPy 1.11.0 Release Notes +************************** + +This release supports Python 2.6 - 2.7 and 3.2 - 3.5. + + +Highlights +========== + + +Dropped Support: + + +Future Changes: + + +Compatibility notes +=================== + + +New Features +============ + + +Improvements +============ + + +Changes +======= + + +Deprecations +============ + diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 20e15d624..cbf4a62b9 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -32,5 +32,6 @@ #define NPY_1_8_API_VERSION 0x00000008 #define NPY_1_9_API_VERSION 0x00000008 #define NPY_1_10_API_VERSION 0x00000008 +#define NPY_1_11_API_VERSION 0x00000008 #endif diff --git a/pavement.py b/pavement.py index 9e3cb065c..ac857a492 100644 --- a/pavement.py +++ b/pavement.py @@ -99,10 +99,10 @@ finally: #----------------------------------- # Source of the release notes -RELEASE_NOTES = 'doc/release/1.10.0-notes.rst' +RELEASE_NOTES = 'doc/release/1.11.0-notes.rst' # Start/end of the log (from git) -LOG_START = 'v1.9.0b1' +LOG_START = 'v1.10.0b1' LOG_END = 'master' @@ -48,7 +48,7 @@ Operating System :: MacOS """ MAJOR = 1 -MINOR = 10 +MINOR = 11 MICRO = 0 ISRELEASED = False VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) |