Skip to content

Commit dfbc1fe

Browse files
jrebackNo-Stream
authored andcommitted
Revert "Remove pyx dependencies from setup (pandas-dev#17478)" (pandas-dev#17565)
This reverts commit e6aed2e.
1 parent db53b9e commit dfbc1fe

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

setup.py

+22-9
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,14 @@ class CheckSDist(sdist_class):
348348
def initialize_options(self):
349349
sdist_class.initialize_options(self)
350350

351+
'''
352+
self._pyxfiles = []
353+
for root, dirs, files in os.walk('pandas'):
354+
for f in files:
355+
if f.endswith('.pyx'):
356+
self._pyxfiles.append(pjoin(root, f))
357+
'''
358+
351359
def run(self):
352360
if 'cython' in cmdclass:
353361
self.run_command('cython')
@@ -471,10 +479,11 @@ def pxd(name):
471479
'_libs.lib': {'pyxfile': '_libs/lib',
472480
'depends': lib_depends + tseries_depends},
473481
'_libs.hashtable': {'pyxfile': '_libs/hashtable',
482+
'pxdfiles': ['_libs/hashtable'],
474483
'depends': (['pandas/_libs/src/klib/khash_python.h']
475484
+ _pxi_dep['hashtable'])},
476485
'_libs.tslib': {'pyxfile': '_libs/tslib',
477-
'pxdfiles': ['_libs/src/util'],
486+
'pxdfiles': ['_libs/src/util', '_libs/lib'],
478487
'depends': tseries_depends,
479488
'sources': ['pandas/_libs/src/datetime/np_datetime.c',
480489
'pandas/_libs/src/datetime/np_datetime_strings.c']},
@@ -490,20 +499,21 @@ def pxd(name):
490499
'_libs.index': {'pyxfile': '_libs/index',
491500
'sources': ['pandas/_libs/src/datetime/np_datetime.c',
492501
'pandas/_libs/src/datetime/np_datetime_strings.c'],
493-
'pxdfiles': ['_libs/src/util'],
502+
'pxdfiles': ['_libs/src/util', '_libs/hashtable'],
494503
'depends': _pxi_dep['index']},
495504
'_libs.algos': {'pyxfile': '_libs/algos',
496-
'pxdfiles': ['_libs/src/util'],
505+
'pxdfiles': ['_libs/src/util', '_libs/algos', '_libs/hashtable'],
497506
'depends': _pxi_dep['algos']},
498507
'_libs.groupby': {'pyxfile': '_libs/groupby',
499-
'pxdfiles': ['_libs/src/util'],
500-
'depends': _pxi_dep['groupby']},
508+
'pxdfiles': ['_libs/src/util', '_libs/algos'],
509+
'depends': _pxi_dep['groupby']},
501510
'_libs.join': {'pyxfile': '_libs/join',
502-
'pxdfiles': ['_libs/src/util'],
511+
'pxdfiles': ['_libs/src/util', '_libs/hashtable'],
503512
'depends': _pxi_dep['join']},
504513
'_libs.reshape': {'pyxfile': '_libs/reshape',
505514
'depends': _pxi_dep['reshape']},
506515
'_libs.interval': {'pyxfile': '_libs/interval',
516+
'pxdfiles': ['_libs/hashtable'],
507517
'depends': _pxi_dep['interval']},
508518
'_libs.window': {'pyxfile': '_libs/window',
509519
'pxdfiles': ['_libs/src/skiplist', '_libs/src/util'],
@@ -516,9 +526,12 @@ def pxd(name):
516526
'sources': ['pandas/_libs/src/parser/tokenizer.c',
517527
'pandas/_libs/src/parser/io.c']},
518528
'_libs.sparse': {'pyxfile': '_libs/sparse',
519-
'depends': _pxi_dep['sparse']},
520-
'_libs.testing': {'pyxfile': '_libs/testing'},
521-
'_libs.hashing': {'pyxfile': '_libs/hashing'},
529+
'depends': (['pandas/_libs/sparse.pyx'] +
530+
_pxi_dep['sparse'])},
531+
'_libs.testing': {'pyxfile': '_libs/testing',
532+
'depends': ['pandas/_libs/testing.pyx']},
533+
'_libs.hashing': {'pyxfile': '_libs/hashing',
534+
'depends': ['pandas/_libs/hashing.pyx']},
522535
'io.sas._sas': {'pyxfile': 'io/sas/sas'},
523536
}
524537

0 commit comments

Comments
 (0)