diff --git a/pandas/_libs/reshape.pyx b/pandas/_libs/reshape.pyx index db2e8b43d1ead..c4104b66e009f 100644 --- a/pandas/_libs/reshape.pyx +++ b/pandas/_libs/reshape.pyx @@ -10,7 +10,7 @@ np.import_array() from numpy cimport (ndarray, int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t, - uint32_t, uint64_t, float16_t, float32_t, float64_t) + uint32_t, uint64_t, float32_t, float64_t) cdef double NaN = np.NaN cdef double nan = NaN diff --git a/pandas/_libs/sparse.pyx b/pandas/_libs/sparse.pyx index 5484cbda5bdf9..bbdd5f0d8334c 100644 --- a/pandas/_libs/sparse.pyx +++ b/pandas/_libs/sparse.pyx @@ -1,5 +1,5 @@ from numpy cimport (ndarray, uint8_t, int64_t, int32_t, int16_t, int8_t, - float64_t, float32_t, float16_t) + float64_t, float32_t) cimport numpy as np cimport cython diff --git a/setup.py b/setup.py index c3e0c037625da..80d4fb4a0a067 100755 --- a/setup.py +++ b/setup.py @@ -461,6 +461,13 @@ def pxd(name): return os.path.abspath(pjoin('pandas', name + '.pxd')) +if _have_setuptools: + # Note: this is a list, whereas `numpy_incl` in build_ext.build_extensions + # is a string + numpy_incls = [pkg_resources.resource_filename('numpy', 'core/include')] +else: + numpy_incls = [] + # args to ignore warnings if is_platform_windows(): extra_compile_args = [] @@ -503,7 +510,8 @@ def pxd(name): 'depends': _pxi_dep['index'], 'sources': np_datetime_sources}, '_libs.indexing': { - 'pyxfile': '_libs/indexing'}, + 'pyxfile': '_libs/indexing', + 'include': []}, '_libs.interval': { 'pyxfile': '_libs/interval', 'pxdfiles': ['_libs/hashtable'], @@ -536,10 +544,12 @@ def pxd(name): 'include': []}, '_libs.reshape': { 'pyxfile': '_libs/reshape', - 'depends': _pxi_dep['reshape']}, + 'depends': _pxi_dep['reshape'], + 'include': numpy_incls}, '_libs.sparse': { 'pyxfile': '_libs/sparse', - 'depends': _pxi_dep['sparse']}, + 'depends': _pxi_dep['sparse'], + 'include': numpy_incls}, '_libs.tslib': { 'pyxfile': '_libs/tslib', 'pxdfiles': ['_libs/src/util', @@ -579,8 +589,7 @@ def pxd(name): '_libs/tslibs/frequencies']}, '_libs.tslibs.parsing': { 'pyxfile': '_libs/tslibs/parsing', - 'pxdfiles': ['_libs/src/util', - '_libs/src/khash']}, + 'include': numpy_incls}, '_libs.tslibs.resolution': { 'pyxfile': '_libs/tslibs/resolution', 'pxdfiles': ['_libs/src/util', @@ -604,14 +613,16 @@ def pxd(name): 'pyxfile': '_libs/tslibs/timezones', 'pxdfiles': ['_libs/src/util']}, '_libs.testing': { - 'pyxfile': '_libs/testing'}, + 'pyxfile': '_libs/testing', + 'include': []}, '_libs.window': { 'pyxfile': '_libs/window', 'pxdfiles': ['_libs/src/skiplist', '_libs/src/util'], 'depends': ['pandas/_libs/src/skiplist.pyx', 'pandas/_libs/src/skiplist.h']}, 'io.sas._sas': { - 'pyxfile': 'io/sas/sas'}} + 'pyxfile': 'io/sas/sas', + 'include': numpy_incls}} extensions = []