Skip to content

Revert "explicitly set 'include' to numpy_incls (#18112)" #18365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2017
Merged

Revert "explicitly set 'include' to numpy_incls (#18112)" #18365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas/_libs/reshape.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, float32_t, float64_t)
uint32_t, uint64_t, float16_t, float32_t, float64_t)

cdef double NaN = <double> np.NaN
cdef double nan = NaN
Expand Down
2 changes: 1 addition & 1 deletion pandas/_libs/sparse.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from numpy cimport (ndarray, uint8_t, int64_t, int32_t, int16_t, int8_t,
float64_t, float32_t)
float64_t, float32_t, float16_t)
cimport numpy as np

cimport cython
Expand Down
25 changes: 7 additions & 18 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,6 @@ 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 = []
Expand Down Expand Up @@ -510,8 +503,7 @@ def pxd(name):
'depends': _pxi_dep['index'],
'sources': np_datetime_sources},
'_libs.indexing': {
'pyxfile': '_libs/indexing',
'include': []},
'pyxfile': '_libs/indexing'},
'_libs.interval': {
'pyxfile': '_libs/interval',
'pxdfiles': ['_libs/hashtable'],
Expand Down Expand Up @@ -544,12 +536,10 @@ def pxd(name):
'include': []},
'_libs.reshape': {
'pyxfile': '_libs/reshape',
'depends': _pxi_dep['reshape'],
'include': numpy_incls},
'depends': _pxi_dep['reshape']},
'_libs.sparse': {
'pyxfile': '_libs/sparse',
'depends': _pxi_dep['sparse'],
'include': numpy_incls},
'depends': _pxi_dep['sparse']},
'_libs.tslib': {
'pyxfile': '_libs/tslib',
'pxdfiles': ['_libs/src/util',
Expand Down Expand Up @@ -590,7 +580,8 @@ def pxd(name):
'_libs/tslibs/frequencies']},
'_libs.tslibs.parsing': {
'pyxfile': '_libs/tslibs/parsing',
'include': numpy_incls},
'pxdfiles': ['_libs/src/util',
'_libs/src/khash']},
'_libs.tslibs.resolution': {
'pyxfile': '_libs/tslibs/resolution',
'pxdfiles': ['_libs/src/util',
Expand All @@ -614,16 +605,14 @@ def pxd(name):
'pyxfile': '_libs/tslibs/timezones',
'pxdfiles': ['_libs/src/util']},
'_libs.testing': {
'pyxfile': '_libs/testing',
'include': []},
'pyxfile': '_libs/testing'},
'_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',
'include': numpy_incls}}
'pyxfile': 'io/sas/sas'}}

extensions = []

Expand Down