8000 Implement npy_dtime.pyx by jbrockmendel · Pull Request #17805 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Implement npy_dtime.pyx #17805

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 17 commits into from
Oct 29, 2017
Merged

Implement npy_dtime.pyx #17805

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
53ec4d1
implement npy_dtime.pyx
jbrockmendel Oct 6, 2017
67b3ec3
whitespace fixup
jbrockmendel Oct 6, 2017
76cad9a
fixup typo
jbrockmendel Oct 6, 2017
ce7197d
flake8 fixup
jbrockmendel Oct 7, 2017
a1f8fc1
Rename npy_dtime-->np_datetime
jbrockmendel Oct 15, 2017
e4ce186
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 21, 2017
a345836
flake8 fixup
jbrockmendel Oct 21, 2017
c0b399e
re-privatize _check_dts_bounds
jbrockmendel Oct 23, 2017
1791389
dummy commit to force ci re-run
jbrockmendel Oct 23, 2017
16603d4
re-de-privatize
jbrockmendel Oct 23, 2017
09a6f19
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 28, 2017
c05cec7
edits per reviewer suggestions
jbrockmendel Oct 28, 2017
c0b8216
revert void; format per reviewer suggestion
jbrockmendel Oct 28, 2017
a9ca0b4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 28, 2017
c3a1ce9
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 29, 2017
7ac9615
flake8 typo fixup
jbrockmendel Oct 29, 2017
e017a52
whitespace fixup
jbrockmendel Oct 29, 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
Rename npy_dtime-->np_datetime
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 15, 2017
commit a1f8fc162fa0dc1f393f5d8ad5453091ece7941a
4 changes: 2 additions & 2 deletions pandas/_libs/tslib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ from datetime cimport (
from datetime import timedelta, datetime
from datetime import time as datetime_time

from tslibs.npy_dtime cimport check_dts_bounds as _check_dts_bounds
from tslibs.npy_dtime import OutOfBoundsDatetime
from tslibs.np_datetime cimport check_dts_bounds as _check_dts_bounds
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a reason for the rename?

Copy link
Member Author

Choose a reason for hiding this comment

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

... because you told me to change it

Copy link
Contributor

Choose a reason for hiding this comment

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

the de-privatize is what I am referring. I don't recall asking for that and its not necessary.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh. De-privatized because it isn't actually private when is this module. But I'll revert it anyway.

Copy link
Contributor

Choose a reason for hiding this comment

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

de-privatize here (you did elsewhere)

from tslibs.np_datetime import OutOfBoundsDatetime

from khash cimport (
khiter_t,
Expand Down
0 pandas/_libs/tslibs/npy_dtime.pxd → pandas/_libs/tslibs/np_datetime.pxd
View file
Open in desktop
File renamed without changes.
0 pandas/_libs/tslibs/npy_dtime.pyx → pandas/_libs/tslibs/np_datetime.pyx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pandas/_libs/tslibs/strptime.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ from numpy cimport ndarray, int64_t
from datetime import date as datetime_date
from datetime cimport datetime

from npy_dtime cimport (check_dts_bounds,
dtstruct_to_dt64, pandas_datetimestruct)
from np_datetime cimport (check_dts_bounds,
dtstruct_to_dt64, pandas_datetimestruct)

from util cimport is_string_object, get_nat

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ class CheckSDist(sdist_class):
'pandas/_libs/sparse.pyx',
'pandas/_libs/parsers.pyx',
'pandas/_libs/tslibs/strptime.pyx',
'pandas/_libs/tslibs/npy_dtime.pyx',
'pandas/_libs/tslibs/np_datetime.pyx',
'pandas/_libs/tslibs/timezones.pyx',
'pandas/_libs/tslibs/fields.pyx',
'pandas/_libs/tslibs/frequencies.pyx',
Expand Down Expand Up @@ -487,7 +487,7 @@ def pxd(name):
'depends': tseries_depends,
'sources': ['pandas/_libs/src/datetime/np_datetime.c',
'pandas/_libs/src/datetime/np_datetime_strings.c']},
'_libs.tslibs.npy_dtime': {'pyxfile': '_libs/tslibs/npy_dtime',
'_libs.tslibs.np_datetime': {'pyxfile': '_libs/tslibs/np_datetime',
'depends': ['pandas/_libs/src/datetime/np_datetime.h',
'pandas/_libs/src/datetime/np_datetime_strings.h'],
'sources': ['pandas/_libs/src/datetime/np_datetime.c',
Expand Down
0