Skip to content

Separate parsing functions out from tslib #17363

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 20 commits into from
Sep 26, 2017
Merged

Separate parsing functions out from tslib #17363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b0428ec
Separate parsing functions out from tslib
jbrockmendel Aug 28, 2017
b19a31e
flake8 whitespace fixup
jbrockmendel Aug 28, 2017
fa6def5
Address reviewer comments
jbrockmendel Aug 29, 2017
2cd2ab6
Fix __doc__ cython complaint
jbrockmendel Aug 29, 2017
c765e26
lint fixup
jbrockmendel Aug 30, 2017
b3ca3c0
Reviewer comments; remove cython decorators
jbrockmendel Sep 6, 2017
e36f8be
kludge to move tslibs/parsing to make asv work
jbrockmendel Sep 6, 2017
c52c796
kludge to move tslibs/parsing to make asv work
jbrockmendel Sep 6, 2017
f5259ea
flake8 whitespace fixup
jbrockmendel Sep 7, 2017
d1765ab
Dummy commit to force CI
jbrockmendel Sep 7, 2017
ceac008
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 8, 2017
e3995be
Whitespace fixup
jbrockmendel Sep 8, 2017
6db3e3c
rebase
jbrockmendel Sep 8, 2017
cfcb002
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 15, 2017
ff57861
Remove duplicate file
jbrockmendel Sep 15, 2017
62cc7b0
Reviewer comments; import try_parse_xyz directly from tslibs.parsing
jbrockmendel Sep 17, 2017
21046b3
flake8 fixup
jbrockmendel Sep 18, 2017
a5f8eca
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 23, 2017
364a6b0
keep _DATEUTIL_LEXER_SPLIT private to tslibs.parsing
jbrockmendel Sep 24, 2017
f89d11e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 25, 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
kludge to move tslibs/parsing to make asv work
  • Loading branch information
@jbrockmendel
jbrockmendel committed Sep 6, 2017
commit e36f8be13ec9aacdf23cff72aa79915d5ea6647e
2 changes: 1 addition & 1 deletion pandas/_libs/period.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ from tslib cimport (
_get_dst_info,
_nat_scalar_rules)

from tslibs.parsing import parse_time_string, NAT_SENTINEL
from .parsing import parse_time_string, NAT_SENTINEL

from pandas.tseries import offsets
from pandas.tseries import frequencies
Expand Down
2 changes: 1 addition & 1 deletion pandas/_libs/src/inference.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ iNaT = util.get_nat()

cdef bint PY2 = sys.version_info[0] == 2

from pandas._libs.tslibs.parsing import (
from pandas._libs.parsing import (
try_parse_dates,
try_parse_date_and_time,
try_parse_year_month_day,
Expand Down
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 @@ -66,8 +66,8 @@ from khash cimport (
kh_init_int64, kh_int64_t,
kh_resize_int64, kh_get_int64)

from tslibs import parsing # noqa
from tslibs.parsing import ( # noqa
from . import parsing # noqa
from .parsing import ( # noqa
DateParseError,
_format_is_iso,
_DATEUTIL_LEXER_SPLIT,
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 @@ -331,7 +331,7 @@ class CheckSDist(sdist_class):
_pyxfiles = ['pandas/_libs/lib.pyx',
'pandas/_libs/hashtable.pyx',
'pandas/_libs/tslib.pyx',
'pandas/_libs/tslibs/parsing.pyx',
'pandas/_libs/parsing.pyx',
'pandas/_libs/period.pyx',
'pandas/_libs/index.pyx',
'pandas/_libs/algos.pyx',
Expand Down Expand Up @@ -482,7 +482,7 @@ def pxd(name):
'pxdfiles': ['_libs/hashtable'],
'depends': (['pandas/_libs/src/klib/khash_python.h']
+ _pxi_dep['hashtable'])},
'_libs.tslibs.parsing': {'pyxfile': '_libs/tslibs/parsing'},
'_libs.parsing': {'pyxfile': '_libs/parsing'},
'_libs.tslib': {'pyxfile': '_libs/tslib',
'pxdfiles': ['_libs/src/util', '_libs/lib'],
'depends': tseries_depends,
Expand Down