Skip to content

Commit f1b1158

Browse files
authored
Revert "explicitly set 'include' to numpy_incls (#18112)" (#18365)
This reverts commit 54f2a5e.
1 parent 1798c9d commit f1b1158

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
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, float32_t, float64_t)
13+
uint32_t, uint64_t, float16_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)
2+
float64_t, float32_t, float16_t)
33
cimport numpy as np
44

55
cimport cython

setup.py

+7-18
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,6 @@ 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-
471464
# args to ignore warnings
472465
if is_platform_windows():
473466
extra_compile_args = []
@@ -510,8 +503,7 @@ def pxd(name):
510503
'depends': _pxi_dep['index'],
511504
'sources': np_datetime_sources},
512505
'_libs.indexing': {
513-
'pyxfile': '_libs/indexing',
514-
'include': []},
506+
'pyxfile': '_libs/indexing'},
515507
'_libs.interval': {
516508
'pyxfile': '_libs/interval',
517509
'pxdfiles': ['_libs/hashtable'],
@@ -544,12 +536,10 @@ def pxd(name):
544536
'include': []},
545537
'_libs.reshape': {
546538
'pyxfile': '_libs/reshape',
547-
'depends': _pxi_dep['reshape'],
548-
'include': numpy_incls},
539+
'depends': _pxi_dep['reshape']},
549540
'_libs.sparse': {
550541
'pyxfile': '_libs/sparse',
551-
'depends': _pxi_dep['sparse'],
552-
'include': numpy_incls},
542+
'depends': _pxi_dep['sparse']},
553543
'_libs.tslib': {
554544
'pyxfile': '_libs/tslib',
555545
'pxdfiles': ['_libs/src/util',
@@ -590,7 +580,8 @@ def pxd(name):
590580
'_libs/tslibs/frequencies']},
591581
'_libs.tslibs.parsing': {
592582
'pyxfile': '_libs/tslibs/parsing',
593-
'include': numpy_incls},
583+
'pxdfiles': ['_libs/src/util',
584+
'_libs/src/khash']},
594585
'_libs.tslibs.resolution': {
595586
'pyxfile': '_libs/tslibs/resolution',
596587
'pxdfiles': ['_libs/src/util',
@@ -614,16 +605,14 @@ def pxd(name):
614605
'pyxfile': '_libs/tslibs/timezones',
615606
'pxdfiles': ['_libs/src/util']},
616607
'_libs.testing': {
617-
'pyxfile': '_libs/testing',
618-
'include': []},
608+
'pyxfile': '_libs/testing'},
619609
'_libs.window': {
620610
'pyxfile': '_libs/window',
621611
'pxdfiles': ['_libs/src/skiplist', '_libs/src/util'],
622612
'depends': ['pandas/_libs/src/skiplist.pyx',
623613
'pandas/_libs/src/skiplist.h']},
624614
'io.sas._sas': {
625-
'pyxfile': 'io/sas/sas',
626-
'include': numpy_incls}}
615+
'pyxfile': 'io/sas/sas'}}
627616

628617
extensions = []
629618

0 commit comments

Comments
 (0)