8000 Separate conversion functions out from tslib by jbrockmendel · Pull Request #17875 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Separate conversion functions out from tslib #17875

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 11 commits into from
Oct 31, 2017
+522 −456
Merged

Separate conversion functions out from tslib #17875

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f3d6d20
Separate conversion functions out from tslib
jbrockmendel Oct 14, 2017
34e2bad
add tseries_depends
jbrockmendel Oct 15, 2017
dfd4979
whitespace fixup
jbrockmendel Oct 17, 2017
fbd135d
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 24, 2017
2db1457
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 27, 2017
3ad0ffe
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 28, 2017
b1df2fc
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 28, 2017
d3ffff7
edits per reviewer suggestions
jbrockmendel Oct 28, 2017
c8f831a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 28, 2017
5db31ba
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 29, 2017
c4b84f9
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 29, 2017
File filter

Filter by extension

Filter by extension
8000
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts… 
…libs-conversion5
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 29, 2017
commit c4b84f90750d3ae251cda6a22bc86f7b10e1f9e0
10 changes: 6 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,11 @@ def pxd(name):
'pandas/_libs/src/parse_helper.h',
'pandas/_libs/src/compat_helper.h']


tseries_depends = ['pandas/_libs/src/datetime/np_datetime.h',
'pandas/_libs/src/datetime/np_datetime_strings.h',
'pandas/_libs/src/datetime.pxd']
np_datetime_headers = ['pandas/_libs/src/datetime/np_datetime.h',
'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']

# some linux distros require it
libraries = ['m'] if not is_platform_windows() else []
Expand All @@ -500,6 +499,9 @@ def pxd(name):
'_libs.tslibs.conversion': {'pyxfile': '_libs/tslibs/conversion',
'depends': tseries_depends,
'sources': np_datetime_sources},
'_libs.tslibs.np_datetime': {'pyxfile': '_libs/tslibs/np_datetime',
'depends': np_datetime_headers,
'sources': np_datetime_sources},
'_libs.tslibs.timedeltas': {'pyxfile': '_libs/tslibs/timedeltas'},
'_libs.tslibs.timezones': {'pyxfile': '_libs/tslibs/timezones'},
'_libs.tslibs.fields': {'pyxfile': '_libs/tslibs/fields',
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0