Skip to content

Move NaT to self-contained module #18014

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 14 commits into from
Nov 1, 2017
Merged

Move NaT to self-contained module #18014

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3926da5
move NaT to self-contained module
jbrockmendel Oct 28, 2017
c232845
de-privatize _nat_strings, copy/paste docstrings instead of patching
jbrockmendel Oct 28, 2017
dd99721
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 28, 2017
776d581
Update pickle_compat
jbrockmendel Oct 28, 2017
3a44c2c
fix import of NaTType
jbrockmendel Oct 28, 2017
009c907
update import; fixes downstream test
jbrockmendel Oct 29, 2017
449d5de
import nat_unpickle to fix backcompat pickle
jbrockmendel Oct 29, 2017
05e5981
flake8 fixup
jbrockmendel Oct 29, 2017
8af334a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 29, 2017
a2c3c7e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 31, 2017
63ff688
remove import to try to recreate test failure
jbrockmendel Oct 31, 2017
5f3b512
nat_pickle fixup
jbrockmendel Oct 31, 2017
11e699c
another try at nat_pickle
jbrockmendel Oct 31, 2017
4b7593e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 31, 2017
File filter

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
import nat_unpickle to fix backcompat pickle
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 29, 2017
commit 449d5deae01d7d4d87de912152f3db3d1e9dc43f
3 changes: 2 additions & 1 deletion pandas/_libs/tslib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ from tslibs.fields import (
get_date_name_field, get_start_end_field, get_date_field,
build_field_sarray)

from tslibs.nattype import NaT, nat_strings
from tslibs.nattype import NaT, nat_strings, __nat_unpickle
# Note: __nat_unpickle needs to be in the namespace for backward compat pickle
Copy link
Contributor

@jreback jreback Oct 31, 2017

Choose a reason for hiding this comment

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

? why is that, you already do the pickle compat dance.
Copy link
Member Author

@jbrockmendel jbrockmendel Oct 31, 2017

Choose a reason for hiding this comment

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

I'd have to go back and check the relevant Travis logs, but there was an error a couple days ago. Might have been an xarray thing?
Copy link
Contributor

@jreback jreback Oct 31, 2017

Choose a reason for hiding this comment

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

this needs a rebase anyhow. remove the import and let's see.
from tslibs.nattype cimport _checknull_with_nat
Copy link
Contributor

@jreback jreback Oct 31, 2017

Choose a reason for hiding this comment

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

in followup, can de-privatize checknull_with_nat
Copy link
Member Author

@jbrockmendel jbrockmendel Oct 31, 2017

Choose a reason for hiding this comment

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

Looking forward to it.


Expand Down