diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-08-14 14:40:39 -0700 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-08-14 14:40:39 -0700 |
| commit | f9259c3732797ed5cd7db60720a5c19c1a4abe0e (patch) | |
| tree | 49fdfd662a444eecd3c134bc4826d6074e548b5f /numpy | |
| parent | 54cae69f027a8e1b8575e64360e27945d57afafc (diff) | |
| parent | 50989f75e132b42bc4146aa5dab576091e29ce2e (diff) | |
| download | numpy-f9259c3732797ed5cd7db60720a5c19c1a4abe0e.tar.gz | |
Merge pull request #3619 from charris/update-ABI-version-and-hash
Update abi version and hash
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/cversions.py | 4 | ||||
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 2 | ||||
| -rw-r--r-- | numpy/core/code_generators/numpy_api.py | 3 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/numpy/core/code_generators/cversions.py b/numpy/core/code_generators/cversions.py index 5ce0757c8..840251aa8 100644 --- a/numpy/core/code_generators/cversions.py +++ b/numpy/core/code_generators/cversions.py @@ -7,8 +7,8 @@ from __future__ import division, absolute_import, print_function from os.path import dirname -from .genapi import fullapi_hash -from . import numpy_api +from genapi import fullapi_hash +import numpy_api if __name__ == '__main__': diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index 5de3d5dc2..24d376ac6 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -15,3 +15,5 @@ 0x00000007 = e396ba3912dcf052eaee1b0b203a7724 # Version 8 Added interface to MapIterObject 0x00000008 = 17321775fc884de0b1eda478cd61c74b +# Version 9 Added interface for partition functions. +0x00000009 = f99a02b75bd60205d1afe1eed080fd53 diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py index 134d6199e..ad9ee3eec 100644 --- a/numpy/core/code_generators/numpy_api.py +++ b/numpy/core/code_generators/numpy_api.py @@ -339,6 +339,7 @@ multiarray_funcs_api = { 'PyArray_Partition': 296, 'PyArray_ArgPartition': 297, 'PyArray_SelectkindConverter': 298, + # End 1.8 API } ufunc_types_api = { @@ -388,7 +389,9 @@ ufunc_funcs_api = { # End 1.6 API 'PyUFunc_DefaultTypeResolver': 39, 'PyUFunc_ValidateCasting': 40, + # End 1.7 API 'PyUFunc_RegisterLoopForDescr': 41, + # End 1.8 API } # List of all the dicts which define the C API diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 9a630225d..7f0ad8bfe 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -31,7 +31,10 @@ C_ABI_VERSION = 0x01000009 # without breaking binary compatibility. In this case, only the C_API_VERSION # (*not* C_ABI_VERSION) would be increased. Whenever binary compatibility is # broken, both C_API_VERSION and C_ABI_VERSION should be increased. -C_API_VERSION = 0x00000008 +# +# 0x00000008 - 1.7.x +# 0x00000009 - 1.8.x +C_API_VERSION = 0x00000009 class MismatchCAPIWarning(Warning): pass |