diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-02-27 07:39:43 +0100 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-03-02 11:22:43 +0100 |
| commit | 23b87a54f2e51ba107c179e3d5486c0c9375aefd (patch) | |
| tree | 5e439e1d5d6d7d06ca0e1aa891c2680d22f51aa6 | |
| parent | 985b2674760176d7ec8d53ecc6a1a4f835a94b15 (diff) | |
| download | numpy-23b87a54f2e51ba107c179e3d5486c0c9375aefd.tar.gz | |
BUG: fix NPY_NO_DEPRECATED_API mechanism.
| -rw-r--r-- | doc/HOWTO_RELEASE.rst.txt | 7 | ||||
| -rw-r--r-- | numpy/core/code_generators/cversions.py | 3 | ||||
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 4 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/doc/HOWTO_RELEASE.rst.txt b/doc/HOWTO_RELEASE.rst.txt index b933cbecd..d6746f4d6 100644 --- a/doc/HOWTO_RELEASE.rst.txt +++ b/doc/HOWTO_RELEASE.rst.txt @@ -284,11 +284,14 @@ Now, set ``release=True`` in setup.py, then git tag <version> git push origin <version> -Update the version of the trunk -------------------------------- +Update the version of the master branch +--------------------------------------- Increment the release number in setup.py. Release candidates should have "rc1" (or "rc2", "rcN") appended to the X.Y.Z format. +Also create a new version hash in cversions.txt and a corresponding version +define NPY_x_y_API_VERSION in numpyconfig.h + Make the release ---------------- The tar-files and binary releases for distribution should be uploaded to SourceForge, diff --git a/numpy/core/code_generators/cversions.py b/numpy/core/code_generators/cversions.py index 020f5f5ae..161dae8d9 100644 --- a/numpy/core/code_generators/cversions.py +++ b/numpy/core/code_generators/cversions.py @@ -5,11 +5,12 @@ The API has is defined by numpy_api_order and ufunc_api_order. """ from __future__ import division -from os.path import join, dirname +from os.path import dirname from genapi import fullapi_hash import numpy_api + if __name__ == '__main__': curdir = dirname(__file__) print fullapi_hash(numpy_api.full_api) diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 7d3b43d3b..5de3d5dc2 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -1,4 +1,6 @@ -# hash below were defined from numpy_api_order.txt and ufunc_api_order.txt +# Hash below were defined from numpy_api_order.txt and ufunc_api_order.txt +# When adding a new version here for a new minor release, also add the same +# version as NPY_x_y_API_VERSION in numpyconfig.h 0x00000001 = 603580d224763e58c5e7147f804dc0f5 0x00000002 = 8ecb29306758515ae69749c803a75da1 0x00000003 = bf22c0d05b31625d2a7015988d61ce5a diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h index 702d9952f..5ca171f21 100644 --- a/numpy/core/include/numpy/numpyconfig.h +++ b/numpy/core/include/numpy/numpyconfig.h @@ -29,5 +29,6 @@ * #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION */ #define NPY_1_7_API_VERSION 0x00000007 +#define NPY_1_8_API_VERSION 0x00000008 #endif |