Skip to content

Commit 54f2a5e

Browse files
jbrockmendeljreback
authored andcommitted
explicitly set 'include' to numpy_incls (#18112)
1 parent 2a6023e commit 54f2a5e

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

pandas/_libs/reshape.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ np.import_array()
1010

1111
from numpy cimport (ndarray,
1212
int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t,
13-
uint32_t, uint64_t, float16_t, float32_t, float64_t)
13+
uint32_t, uint64_t, float32_t, float64_t)
1414

1515
cdef double NaN = <double> np.NaN
1616
cdef double nan = NaN

pandas/_libs/sparse.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from numpy cimport (ndarray, uint8_t, int64_t, int32_t, int16_t, int8_t,
2-
float64_t, float32_t, float16_t)
2+
float64_t, float32_t)
33
cimport numpy as np
44

55
cimport cython

setup.py

+18-7
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,13 @@ def pxd(name):
461461
return os.path.abspath(pjoin('pandas', name + '.pxd'))
462462

463463

464+
if _have_setuptools:
465+
# Note: this is a list, whereas `numpy_incl` in build_ext.build_extensions
466+
# is a string
467+
numpy_incls = [pkg_resources.resource_filename('numpy', 'core/include')]
468+
else:
469+
numpy_incls = []
470+
464471
# args to ignore warnings
465472
if is_platform_windows():
466473
extra_compile_args = []
@@ -503,7 +510,8 @@ def pxd(name):
503510
'depends': _pxi_dep['index'],
504511
'sources': np_datetime_sources},
505512
'_libs.indexing': {
506-
'pyxfile': '_libs/indexing'},
513+
'pyxfile': '_libs/indexing',
514+
'include': []},
507515
'_libs.interval': {
508516
'pyxfile': '_libs/interval',
509517
'pxdfiles': ['_libs/hashtable'],
@@ -536,10 +544,12 @@ def pxd(name):
536544
'include': []},
537545
'_libs.reshape': {
538546
'pyxfile': '_libs/reshape',
539-
'depends': _pxi_dep['reshape']},
547+
'depends': _pxi_dep['reshape'],
548+
'include': numpy_incls},
540549
'_libs.sparse': {
541550
'pyxfile': '_libs/sparse',
542-
'depends': _pxi_dep['sparse']},
551+
'depends': _pxi_dep['sparse'],
552+
'include': numpy_incls},
543553
'_libs.tslib': {
544554
'pyxfile': '_libs/tslib',
545555
'pxdfiles': ['_libs/src/util',
@@ -580,8 +590,7 @@ def pxd(name):
580590
'_libs/tslibs/frequencies']},
581591
'_libs.tslibs.parsing': {
582592
'pyxfile': '_libs/tslibs/parsing',
583-
'pxdfiles': ['_libs/src/util',
584-
'_libs/src/khash']},
593+
'include': numpy_incls},
585594
'_libs.tslibs.resolution': {
586595
'pyxfile': '_libs/tslibs/resolution',
587596
'pxdfiles': ['_libs/src/util',
@@ -605,14 +614,16 @@ def pxd(name):
605614
'pyxfile': '_libs/tslibs/timezones',
606615
'pxdfiles': ['_libs/src/util']},
607616
'_libs.testing': {
608-
'pyxfile': '_libs/testing'},
617+
'pyxfile': '_libs/testing',
618+
'include': []},
609619
'_libs.window': {
610620
'pyxfile': '_libs/window',
611621
'pxdfiles': ['_libs/src/skiplist', '_libs/src/util'],
612622
'depends': ['pandas/_libs/src/skiplist.pyx',
613623
'pandas/_libs/src/skiplist.h']},
614624
'io.sas._sas': {
615-
'pyxfile': 'io/sas/sas'}}
625+
'pyxfile': 'io/sas/sas',
626+
'include': numpy_incls}}
616627

617628
extensions = []
618629

0 commit comments

Comments
 (0)