Skip to content

Commit 4b03a0d

Browse files
committed
Merge branch 'to_timestamp' of https://github.com/saldanhad/pandas-repo into to_timestamp
2 parents c9f6094 + c2d9c6e commit 4b03a0d

File tree

33 files changed

+181
-71
lines changed

33 files changed

+181
-71
lines changed

.github/workflows/code-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212

1313
env:
1414
ENV_FILE: environment.yml

.github/workflows/docbuild-and-upload.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
tags:
99
- '*'
1010
pull_request:
1111
branches:
1212
- main
13-
- 2.2.x
13+
- 2.3.x
1414

1515
env:
1616
ENV_FILE: environment.yml

.github/workflows/package-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
types: [ labeled, opened, synchronize, reopened ]
1313

1414
permissions:

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
paths-ignore:
1313
- "doc/**"
1414
- "web/**"

ci/code_checks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,14 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
159159
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
160160
-i "pandas.infer_freq SA01" \
161161
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
162-
-i "pandas.io.stata.StataReader.data_label SA01" \
163162
-i "pandas.io.stata.StataReader.value_labels RT03,SA01" \
164163
-i "pandas.io.stata.StataReader.variable_labels RT03,SA01" \
165164
-i "pandas.io.stata.StataWriter.write_file SA01" \
166165
-i "pandas.json_normalize RT03,SA01" \
167-
-i "pandas.period_range RT03,SA01" \
168166
-i "pandas.plotting.andrews_curves RT03,SA01" \
169167
-i "pandas.plotting.lag_plot RT03,SA01" \
170168
-i "pandas.plotting.scatter_matrix PR07,SA01" \
171169
-i "pandas.set_eng_float_format RT03,SA01" \
172-
-i "pandas.testing.assert_extension_array_equal SA01" \
173170
-i "pandas.tseries.offsets.BDay PR02,SA01" \
174171
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
175172
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \

doc/source/whatsnew/v3.0.0.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ Bug fixes
544544

545545
Categorical
546546
^^^^^^^^^^^
547-
-
547+
- Bug in :func:`Series.apply` where ``nan`` was ignored for :class:`CategoricalDtype` (:issue:`59938`)
548548
-
549549

550550
Datetimelike
@@ -620,6 +620,7 @@ I/O
620620
^^^
621621
- Bug in :class:`DataFrame` and :class:`Series` ``repr`` of :py:class:`collections.abc.Mapping`` elements. (:issue:`57915`)
622622
- Bug in :meth:`.DataFrame.to_json` when ``"index"`` was a value in the :attr:`DataFrame.column` and :attr:`Index.name` was ``None``. Now, this will fail with a ``ValueError`` (:issue:`58925`)
623+
- Bug in :meth:`DataFrame._repr_html_` which ignored the ``"display.float_format"`` option (:issue:`59876`)
623624
- Bug in :meth:`DataFrame.from_records` where ``columns`` parameter with numpy structured array was not reordering and filtering out the columns (:issue:`59717`)
624625
- Bug in :meth:`DataFrame.to_dict` raises unnecessary ``UserWarning`` when columns are not unique and ``orient='tight'``. (:issue:`58281`)
625626
- Bug in :meth:`DataFrame.to_excel` when writing empty :class:`DataFrame` with :class:`MultiIndex` on both axes (:issue:`57696`)
@@ -652,6 +653,7 @@ Plotting
652653
Groupby/resample/rolling
653654
^^^^^^^^^^^^^^^^^^^^^^^^
654655
- Bug in :meth:`.DataFrameGroupBy.__len__` and :meth:`.SeriesGroupBy.__len__` would raise when the grouping contained NA values and ``dropna=False`` (:issue:`58644`)
656+
- Bug in :meth:`.DataFrameGroupBy.any` that returned True for groups where all Timedelta values are NaT. (:issue:`59712`)
655657
- Bug in :meth:`.DataFrameGroupBy.groups` and :meth:`.SeriesGroupby.groups` that would not respect groupby argument ``dropna`` (:issue:`55919`)
656658
- Bug in :meth:`.DataFrameGroupBy.median` where nat values gave an incorrect result. (:issue:`57926`)
657659
- Bug in :meth:`.DataFrameGroupBy.quantile` when ``interpolation="nearest"`` is inconsistent with :meth:`DataFrame.quantile` (:issue:`47942`)
@@ -680,6 +682,7 @@ Sparse
680682
^^^^^^
681683
- Bug in :class:`SparseDtype` for equal comparison with na fill value. (:issue:`54770`)
682684
- Bug in :meth:`DataFrame.sparse.from_spmatrix` which hard coded an invalid ``fill_value`` for certain subtypes. (:issue:`59063`)
685+
- Bug in :meth:`DataFrame.sparse.to_dense` which ignored subclassing and always returned an instance of :class:`DataFrame` (:issue:`59913`)
683686

684687
ExtensionArray
685688
^^^^^^^^^^^^^^
@@ -697,6 +700,8 @@ Other
697700
- Bug in :class:`DataFrame` when passing a ``dict`` with a NA scalar and ``columns`` that would always return ``np.nan`` (:issue:`57205`)
698701
- Bug in :func:`eval` on :class:`ExtensionArray` on including division ``/`` failed with a ``TypeError``. (:issue:`58748`)
699702
- Bug in :func:`eval` where the names of the :class:`Series` were not preserved when using ``engine="numexpr"``. (:issue:`10239`)
703+
- Bug in :func:`eval` with ``engine="numexpr"`` returning unexpected result for float division. (:issue:`59736`)
704+
- Bug in :func:`to_numeric` raising ``TypeError`` when ``arg`` is a :class:`Timedelta` or :class:`Timestamp` scalar. (:issue:`59944`)
700705
- Bug in :func:`unique` on :class:`Index` not always returning :class:`Index` (:issue:`57043`)
701706
- Bug in :meth:`DataFrame.apply` where passing ``engine="numba"`` ignored ``args`` passed to the applied function (:issue:`58712`)
702707
- Bug in :meth:`DataFrame.eval` and :meth:`DataFrame.query` which caused an exception when using NumPy attributes via ``@`` notation, e.g., ``df.eval("@np.floor(a)")``. (:issue:`58041`)

pandas/_libs/include/pandas/datetime/date_conversions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The full license is in the LICENSE file, distributed with this software.
99

1010
#define PY_SSIZE_T_CLEAN
1111
#include <Python.h>
12+
1213
#include <numpy/ndarraytypes.h>
1314

1415
// Scales value inplace from nanosecond resolution to unit resolution

pandas/_libs/include/pandas/parser/io.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ The full license is in the LICENSE file, distributed with this software.
1010
#pragma once
1111

1212
#define PY_SSIZE_T_CLEAN
13-
#include "tokenizer.h"
1413
#include <Python.h>
1514

15+
#include "tokenizer.h"
16+
1617
#define FS(source) ((file_source *)source)
1718

1819
typedef struct _rd_source {

pandas/_libs/include/pandas/parser/pd_parser.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ extern "C" {
1313
#endif
1414

1515
#define PY_SSIZE_T_CLEAN
16-
#include "pandas/parser/tokenizer.h"
1716
#include <Python.h>
1817

18+
#include "pandas/parser/tokenizer.h"
19+
1920
typedef struct {
2021
int (*to_double)(char *, double *, char, char, int *);
2122
int (*floatify)(PyObject *, double *, int *);

pandas/_libs/include/pandas/vendored/klib/khash_python.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#pragma once
44

55
#include <Python.h>
6+
67
#include <pymem.h>
78
#include <string.h>
89

0 commit comments

Comments
 (0)