Skip to content

Commit

Permalink
ENH: pd.concat with keys and ignore_index=True should raise (#59398)
Browse files Browse the repository at this point in the history
* Add enhancement to v3.0.0

* Raise error when combination of given values don't make sense

* Add test

* Update doc/source/whatsnew/v3.0.0.rst

Co-authored-by: Matthew Roeschke <[email protected]>

* Update pandas/core/reshape/concat.py

Co-authored-by: Matthew Roeschke <[email protected]>

* Update pandas/tests/reshape/concat/test_concat.py

Co-authored-by: Matthew Roeschke <[email protected]>

* Update pandas/tests/reshape/concat/test_concat.py

Co-authored-by: Matthew Roeschke <[email protected]>

* Fix test

---------

Co-authored-by: Matthew Roeschke <[email protected]>
  • Loading branch information
jahn96 and mroeschke authored Aug 10, 2024
1 parent ecc451d commit d093fae
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions doc/source/whatsnew/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Other enhancements
- :meth:`DataFrame.pivot_table` and :func:`pivot_table` now allow the passing of keyword arguments to ``aggfunc`` through ``**kwargs`` (:issue:`57884`)
- :meth:`Series.cummin` and :meth:`Series.cummax` now supports :class:`CategoricalDtype` (:issue:`52335`)
- :meth:`Series.plot` now correctly handle the ``ylabel`` parameter for pie charts, allowing for explicit control over the y-axis label (:issue:`58239`)
- :meth:`pandas.concat` will raise a ``ValueError`` when ``ignore_index=True`` and ``keys`` is not ``None`` (:issue:`59274`)
- Multiplying two :class:`DateOffset` objects will now raise a ``TypeError`` instead of a ``RecursionError`` (:issue:`59442`)
- Restore support for reading Stata 104-format and enable reading 103-format dta files (:issue:`58554`)
- Support reading Stata 102-format (Stata 1) dta files (:issue:`58978`)
Expand Down
5 changes: 5 additions & 0 deletions pandas/core/reshape/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,11 @@ def concat(
0 1 2
1 3 4
"""
if ignore_index and keys is not None:
raise ValueError(
f"Cannot set {ignore_index=} and specify keys. Either should be used."
)

if copy is not lib.no_default:
warnings.warn(
"The copy keyword is deprecated and will be removed in a future "
Expand Down
11 changes: 11 additions & 0 deletions pandas/tests/reshape/concat/test_concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -939,3 +939,14 @@ def test_concat_with_series_and_frame_returns_rangeindex_columns():
result = concat([ser, df])
expected = DataFrame([0, 1, 2], index=[0, 0, 1])
tm.assert_frame_equal(result, expected, check_column_type=True)


def test_concat_with_moot_ignore_index_and_keys():
df1 = DataFrame([[0]])
df2 = DataFrame([[42]])

ignore_index = True
keys = ["df1", "df2"]
msg = f"Cannot set {ignore_index=} and specify keys. Either should be used."
with pytest.raises(ValueError, match=msg):
concat([df1, df2], keys=keys, ignore_index=ignore_index)

0 comments on commit d093fae

Please sign in to comment.