From 4281ff8043d7a2555bcf783c0d86636840901a86 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 4 Nov 2017 17:16:35 -0400 Subject: [PATCH 1/2] BLD: list proper deps for tslib closes #18089 --- setup.py | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 3464169e8d8d1..4128051df3e21 100755 --- a/setup.py +++ b/setup.py @@ -474,7 +474,8 @@ def pxd(name): 'pandas/_libs/src/datetime/np_datetime_strings.h'] np_datetime_sources = ['pandas/_libs/src/datetime/np_datetime.c', 'pandas/_libs/src/datetime/np_datetime_strings.c'] -tseries_depends = np_datetime_headers + ['pandas/_libs/src/datetime.pxd'] +tseries_depends = np_datetime_headers + ['pandas/_libs/src/datetime.pxd', + 'pandas/_libs/tslibs/np_datetime.pxd'] # some linux distros require it libraries = ['m'] if not is_platform_windows() else [] @@ -535,15 +536,24 @@ def pxd(name): 'depends': _pxi_dep['sparse']}, '_libs.tslib': { 'pyxfile': '_libs/tslib', - 'pxdfiles': ['_libs/src/util'], + 'pxdfiles': ['_libs/src/util', + '_libs/tslibs/conversion', + '_libs/tslibs/timedeltas', + '_libs/tslibs/timezones', + '_libs/tslibs/nattype'], 'depends': tseries_depends, 'sources': np_datetime_sources}, '_libs.tslibs.conversion': { 'pyxfile': '_libs/tslibs/conversion', + 'pxdfiles': ['_libs/src/util', + '_libs/tslibs/timezones', + '_libs/tslibs/np_datetime', + '_libs/tslibs/timedeltas'], 'depends': tseries_depends, 'sources': np_datetime_sources}, '_libs.tslibs.fields': { 'pyxfile': '_libs/tslibs/fields', + 'pxdfiles': ['_libs/src/util'], 'depends': tseries_depends, 'sources': np_datetime_sources}, '_libs.tslibs.frequencies': { @@ -557,18 +567,26 @@ def pxd(name): 'depends': np_datetime_headers, 'sources': np_datetime_sources}, '_libs.tslibs.offsets': { - 'pyxfile': '_libs/tslibs/offsets'}, + 'pyxfile': '_libs/tslibs/offsets', + 'pxdfiles': ['_libs/src/util', + '_libs/tslibs/conversion']}, '_libs.tslibs.parsing': { 'pyxfile': '_libs/tslibs/parsing', 'pxdfiles': ['_libs/src/util']}, '_libs.tslibs.strptime': { 'pyxfile': '_libs/tslibs/strptime', + 'pxdfiles': ['_libs/src/util', + '_libs/tslibs/nattype'], 'depends': tseries_depends, 'sources': np_datetime_sources}, '_libs.tslibs.timedeltas': { - 'pyxfile': '_libs/tslibs/timedeltas'}, + 'pyxfile': '_libs/tslibs/timedeltas', + 'pxdfiles': ['_libs/src/util'], + 'depends': np_datetime_headers, + 'sources': np_datetime_sources}, '_libs.tslibs.timezones': { - 'pyxfile': '_libs/tslibs/timezones'}, + 'pyxfile': '_libs/tslibs/timezones', + 'pxdfiles': ['_libs/src/util']}, '_libs.testing': { 'pyxfile': '_libs/testing'}, '_libs.window': { From 2fa2de522282ddaf2ea33f684ad7fe6d761c0372 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 4 Nov 2017 18:29:28 -0400 Subject: [PATCH 2/2] moar --- setup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4128051df3e21..bd7c8f175607c 100755 --- a/setup.py +++ b/setup.py @@ -523,6 +523,10 @@ def pxd(name): 'pandas/_libs/src/parser/io.c']}, '_libs.period': { 'pyxfile': '_libs/period', + 'pxdfiles': ['_libs/src/util', + '_libs/lib', + '_libs/tslibs/timezones', + '_libs/tslibs/nattype'], 'depends': tseries_depends + ['pandas/_libs/src/period_helper.h'], 'sources': np_datetime_sources + ['pandas/_libs/src/period_helper.c']}, '_libs.properties': { @@ -537,6 +541,7 @@ def pxd(name): '_libs.tslib': { 'pyxfile': '_libs/tslib', 'pxdfiles': ['_libs/src/util', + '_libs/src/khash', '_libs/tslibs/conversion', '_libs/tslibs/timedeltas', '_libs/tslibs/timezones', @@ -547,7 +552,6 @@ def pxd(name): 'pyxfile': '_libs/tslibs/conversion', 'pxdfiles': ['_libs/src/util', '_libs/tslibs/timezones', - '_libs/tslibs/np_datetime', '_libs/tslibs/timedeltas'], 'depends': tseries_depends, 'sources': np_datetime_sources}, @@ -572,7 +576,8 @@ def pxd(name): '_libs/tslibs/conversion']}, '_libs.tslibs.parsing': { 'pyxfile': '_libs/tslibs/parsing', - 'pxdfiles': ['_libs/src/util']}, + 'pxdfiles': ['_libs/src/util', + '_libs/src/khash']}, '_libs.tslibs.strptime': { 'pyxfile': '_libs/tslibs/strptime', 'pxdfiles': ['_libs/src/util',