Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
431495b
initial file setup and build
WillAyd Feb 18, 2023
c3dca72
Building standalone impl
WillAyd Feb 18, 2023
d77a2ed
more build
WillAyd Feb 18, 2023
4525e77
linting
WillAyd Feb 18, 2023
782b971
more updates
WillAyd Feb 18, 2023
69abccd
Capsule location change
WillAyd Feb 19, 2023
69460bd
working import
WillAyd Feb 20, 2023
776f0f5
working imports?
WillAyd Feb 20, 2023
c4a05b5
moved lots
WillAyd Feb 20, 2023
a995ee2
Working impl
WillAyd Feb 21, 2023
05e28ad
styling
WillAyd Feb 21, 2023
d938374
import cleanups
WillAyd Feb 21, 2023
df687b3
revert init change
WillAyd Feb 21, 2023
a26f312
cleanups
WillAyd Feb 21, 2023
96b6f96
isort fixups
WillAyd Feb 21, 2023
7b28333
api test fix
WillAyd Feb 21, 2023
ccea2b3
removed unneeded tokenizer add
WillAyd Feb 21, 2023
2bf7264
Hacked together parser capsule
WillAyd Feb 26, 2023
418910d
Symbol cleanups
WillAyd Feb 26, 2023
a4f7e1a
Resolved all undefined symbols in parsers.pyx
WillAyd Feb 26, 2023
ad1d149
IO callbacks restored
WillAyd Feb 26, 2023
5887254
Fix build and test failures
WillAyd Feb 26, 2023
138ea0d
Try relative imports for MSFT compat
WillAyd Feb 26, 2023
679d03d
try py_ssize_t_clean macro
WillAyd Feb 26, 2023
7c4e365
Removed double tokenizer include
WillAyd Feb 26, 2023
5aee18a
removed unneeded include path
WillAyd Feb 26, 2023
a0523be
more cleanups
WillAyd Feb 27, 2023
554d701
noexcept
WillAyd Feb 27, 2023
726d93d
signature cleanup
WillAyd Feb 27, 2023
d2fe542
simplify parser impl
WillAyd Feb 28, 2023
49a2739
retain np_datetime_string license
WillAyd Feb 28, 2023
3981ec2
retained old file structure where possible
WillAyd Feb 28, 2023
fb75100
Commited C file
WillAyd Feb 28, 2023
f51e7f4
Removed erroneous comments
WillAyd Mar 2, 2023
709bf6c
Merge branch 'main' into np-datetime-capsule
WillAyd Mar 2, 2023
f4dac4f
graft pd_parser.c
WillAyd Mar 6, 2023
7fd0a49
Merge branch 'main' into np-datetime-capsule
WillAyd Mar 6, 2023
12179c7
graft -> include
WillAyd Mar 6, 2023
67f5445
Merge remote-tracking branch 'upstream/main' into np-datetime-capsule
WillAyd Mar 9, 2023
9271ce3
Merge branch 'main' into np-datetime-capsule
WillAyd Mar 11, 2023
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
cleanups
  • Loading branch information
WillAyd committed Feb 21, 2023
commit a26f312283283ae620f5b61d2b3f3bc1bcc761fe
2 changes: 1 addition & 1 deletion pandas/_libs/src/ujson/python/objToJSON.c
Original file line number Diff line number Diff line change
Expand Up @@ -1980,7 +1980,7 @@ PyObject *objToJSON(PyObject *Py_UNUSED(self), PyObject *args,
PandasDateTime_IMPORT;
if (PandasDateTimeAPI == NULL) {
return NULL;
}
}

static char *kwlist[] = {"obj",
"ensure_ascii",
Expand Down
9 changes: 4 additions & 5 deletions pandas/_libs/tslibs/np_datetime.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ cdef extern from "src/datetime/pd_datetime.h":
int64_t days
int32_t hrs, min, sec, ms, us, ns, seconds, microseconds, nanoseconds

void pandas_datetime_to_datetimestruct(npy_datetime val,
NPY_DATETIMEUNIT fr,
npy_datetimestruct *result) nogil

npy_datetime npy_datetimestruct_to_datetime(NPY_DATETIMEUNIT fr,
npy_datetimestruct *d) nogil

Expand All @@ -70,10 +74,6 @@ cdef extern from "src/datetime/pd_datetime.h":

void PandasDateTime_IMPORT()

void pandas_datetime_to_datetimestruct(npy_datetime val,
NPY_DATETIMEUNIT fr,
npy_datetimestruct *result) nogil

ctypedef enum FormatRequirement:
PARTIAL_MATCH
EXACT_MATCH
Expand Down Expand Up @@ -136,4 +136,3 @@ cdef int64_t convert_reso(
NPY_DATETIMEUNIT to_reso,
bint round_ok,
) except? -1