Skip to content

explicitly set 'include' to numpy_incls #18112

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
Nov 16, 2017
Merged

explicitly set 'include' to numpy_incls #18112

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b81e094
explicitly set include to numpy_incls
jbrockmendel Nov 4, 2017
e944e7c
type fixup
jbrockmendel Nov 4, 2017
37ad0f2
fixup whitespace
jbrockmendel Nov 5, 2017
d00a814
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 5, 2017
710aa94
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 5, 2017
4b1332a
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 6, 2017
7252bdd
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 7, 2017
2467cb4
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 10, 2017
719a457
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 12, 2017
c7ffb02
revert controversial changes
jbrockmendel Nov 12, 2017
0274152
Merge branch 'master' of https://github.com/pandas-dev/pandas into np…
jbrockmendel Nov 13, 2017
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
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/pandas-dev/pandas into np… 
…_deps2

Fix incorrect entries in setup
  • Loading branch information
@jbrockmendel
jbrockmendel committed Nov 5, 2017
commit 710aa94ef93738a6f7df085a2d85ab76569862d0
12 changes: 4 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,7 @@ def pxd(name):
'_libs.index': {
'pyxfile': '_libs/index',
'pxdfiles': ['_libs/src/util', '_libs/hashtable'],
'depends': _pxi_dep['index'],
'sources': np_datetime_sources},
'depends': _pxi_dep['index']},
'_libs.indexing': {
'pyxfile': '_libs/indexing',
'include': []},
Expand Down Expand Up @@ -590,14 +589,11 @@ def pxd(name):
'_libs.tslibs.strptime': {
'pyxfile': '_libs/tslibs/strptime',
'pxdfiles': ['_libs/src/util',
'_libs/tslibs/nattype'],
'depends': tseries_depends,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tseries_depends already incldes np_datetime, so no need to add this explicty.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this one needs to change back

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the diff it isn't clear which file you're referring to. Best guess is tslibs.strptime?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for tslibs.strptime, still needs to have tseries_depends, np? (e.g. np_datetime is there)

'sources': np_datetime_sources},
'_libs/tslibs/nattype',
'_libs/tslibs/np_datetime']},
'_libs.tslibs.timedeltas': {
'pyxfile': '_libs/tslibs/timedeltas',
'pxdfiles': ['_libs/src/util'],
'depends': np_datetime_headers,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same.

'sources': np_datetime_sources},
'pxdfiles': ['_libs/src/util']},
'_libs.tslibs.timezones': {
'pyxfile': '_libs/tslibs/timezones',
'pxdfiles': ['_libs/src/util']},
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.