Skip to content

Commit efc6303

Browse files
committed
Merge branch 'main' of https://github.com/pandas-dev/pandas into groupby_cat_unobserved
2 parents e65dd2e + 9820edc commit efc6303

File tree

154 files changed

+1095
-1954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1095
-1954
lines changed

.github/workflows/sdist.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
python-version: ["3.8", "3.9", "3.10"]
33+
python-version: ["3.8", "3.9", "3.10", "3.11"]
3434
concurrency:
3535
# https://github.community/t/concurrecy-not-work-for-push/183068/7
3636
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{matrix.python-version}}-sdist
@@ -42,7 +42,7 @@ jobs:
4242
fetch-depth: 0
4343

4444
- name: Set up Python
45-
uses: actions/setup-python@v3
45+
uses: actions/setup-python@v4
4646
with:
4747
python-version: ${{ matrix.python-version }}
4848

@@ -86,6 +86,8 @@ jobs:
8686
pip install numpy==1.20.3 ;;
8787
3.10)
8888
pip install numpy==1.21.2 ;;
89+
3.11)
90+
pip install numpy==1.23.2 ;;
8991
esac
9092
9193
- name: Import pandas

asv_bench/benchmarks/groupby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ def time_different_python_functions_multicol(self, df):
310310
df.groupby(["key1", "key2"]).agg([sum, min, max])
311311

312312
def time_different_python_functions_singlecol(self, df):
313-
df.groupby("key1").agg([sum, min, max])
313+
df.groupby("key1")[["value1", "value2", "value3"]].agg([sum, min, max])
314314

315315

316316
class GroupStrings:

ci/deps/actions-38-minimum_versions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ dependencies:
2525
- blosc=1.21.0
2626
- bottleneck=1.3.2
2727
- brotlipy=0.7.0
28-
- fastparquet=0.4.0
28+
- fastparquet=0.6.3
2929
- fsspec=2021.07.0
3030
- html5lib=1.1
3131
- hypothesis=6.13.0
3232
- gcsfs=2021.07.0
3333
- jinja2=3.0.0
3434
- lxml=4.6.3
35-
- matplotlib=3.3.2
35+
- matplotlib=3.6.0
3636
- numba=0.53.1
3737
- numexpr=2.7.3
3838
- odfpy=1.4.1

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106
if fname == "index.rst" and os.path.abspath(dirname) == source_path:
107107
continue
108-
elif pattern == "-api" and reldir.startswith("reference"):
108+
if pattern == "-api" and reldir.startswith("reference"):
109109
exclude_patterns.append(fname)
110110
elif (
111111
pattern == "whatsnew"

doc/source/getting_started/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ Can be managed as optional_extra with ``pandas[plot, output_formatting]``, depen
310310
========================= ================== ================== =============================================================
311311
Dependency Minimum Version optional_extra Notes
312312
========================= ================== ================== =============================================================
313-
matplotlib 3.3.2 plot Plotting library
313+
matplotlib 3.6.0 plot Plotting library
314314
Jinja2 3.0.0 output_formatting Conditional formatting with DataFrame.style
315315
tabulate 0.8.9 output_formatting Printing in Markdown-friendly format (see `tabulate`_)
316316
========================= ================== ================== =============================================================

doc/source/user_guide/basics.rst

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,34 +1039,6 @@ not noted for a particular column will be ``NaN``:
10391039
10401040
tsdf.agg({"A": ["mean", "min"], "B": "sum"})
10411041
1042-
.. _basics.aggregation.mixed_string:
1043-
1044-
Mixed dtypes
1045-
++++++++++++
1046-
1047-
.. deprecated:: 1.4.0
1048-
Attempting to determine which columns cannot be aggregated and silently dropping them from the results is deprecated and will be removed in a future version. If any porition of the columns or operations provided fail, the call to ``.agg`` will raise.
1049-
1050-
When presented with mixed dtypes that cannot aggregate, ``.agg`` will only take the valid
1051-
aggregations. This is similar to how ``.groupby.agg`` works.
1052-
1053-
.. ipython:: python
1054-
1055-
mdf = pd.DataFrame(
1056-
{
1057-
"A": [1, 2, 3],
1058-
"B": [1.0, 2.0, 3.0],
1059-
"C": ["foo", "bar", "baz"],
1060-
"D": pd.date_range("20130101", periods=3),
1061-
}
1062-
)
1063-
mdf.dtypes
1064-
1065-
.. ipython:: python
1066-
:okwarning:
1067-
1068-
mdf.agg(["min", "sum"])
1069-
10701042
.. _basics.aggregation.custom_describe:
10711043

10721044
Custom describe

doc/source/user_guide/groupby.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ functions:
10071007
.. ipython:: python
10081008
:okwarning:
10091009
1010-
grouped = df.groupby("A")
1010+
grouped = df.groupby("A")[["C", "D"]]
10111011
grouped.agg(lambda x: x.std())
10121012
10131013
But, it's rather verbose and can be untidy if you need to pass additional

doc/source/user_guide/options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ displayed when calling :meth:`~pandas.DataFrame.info`.
249249
``display.max_info_rows``: :meth:`~pandas.DataFrame.info` will usually show null-counts for each column.
250250
For a large :class:`DataFrame`, this can be quite slow. ``max_info_rows`` and ``max_info_cols``
251251
limit this null check to the specified rows and columns respectively. The :meth:`~pandas.DataFrame.info`
252-
keyword argument ``null_counts=True`` will override this.
252+
keyword argument ``show_counts=True`` will override this.
253253

254254
.. ipython:: python
255255

doc/source/whatsnew/v0.13.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ Enhancements
733733
734734
.. _scipy: http://www.scipy.org
735735
.. _documentation: http://docs.scipy.org/doc/scipy/reference/interpolate.html#univariate-interpolation
736-
.. _guide: http://docs.scipy.org/doc/scipy/reference/tutorial/interpolate.html
736+
.. _guide: https://docs.scipy.org/doc/scipy/tutorial/interpolate.html
737737

738738
- ``to_csv`` now takes a ``date_format`` keyword argument that specifies how
739739
output datetime objects should be formatted. Datetimes encountered in the

doc/source/whatsnew/v0.20.0.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,13 @@ aggregations. This is similar to how groupby ``.agg()`` works. (:issue:`15015`)
104104
'D': pd.date_range('20130101', periods=3)})
105105
df.dtypes
106106
107-
.. ipython:: python
108-
:okwarning:
107+
.. code-block:: python
109108
110-
df.agg(['min', 'sum'])
109+
In [10]: df.agg(['min', 'sum'])
110+
Out[10]:
111+
A B C D
112+
min 1 1.0 bar 2013-01-01
113+
sum 6 6.0 foobarbaz NaT
111114
112115
.. _whatsnew_0200.enhancements.dataio_dtype:
113116

doc/source/whatsnew/v1.5.2.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ including other versions of pandas.
1414
Fixed regressions
1515
~~~~~~~~~~~~~~~~~
1616
- Fixed regression in :meth:`Series.replace` raising ``RecursionError`` with numeric dtype and when specifying ``value=None`` (:issue:`45725`)
17+
- Fixed regression in :meth:`DataFrame.plot` preventing :class:`~matplotlib.colors.Colormap` instance
18+
from being passed using the ``colormap`` argument if Matplotlib 3.6+ is used (:issue:`49374`)
1719
-
1820

1921
.. ---------------------------------------------------------------------------
2022
.. _whatsnew_152.bug_fixes:
2123

2224
Bug fixes
2325
~~~~~~~~~
24-
-
26+
- Bug in the Copy-on-Write implementation losing track of views in certain chained indexing cases (:issue:`48996`)
2527
-
2628

2729
.. ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)