Skip to content

Commit

Permalink
Merge branch 'main' into fix59933
Browse files Browse the repository at this point in the history
  • Loading branch information
anzber authored Feb 20, 2025
2 parents 379007f + ddcec67 commit 705c0c5
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 17 deletions.
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# ci
ci/ @mroeschke

# web
web/ @datapythonista

# docs
doc/cheatsheet @Dr-Irv
doc/source/development @noatamir
Expand Down
2 changes: 2 additions & 0 deletions doc/source/whatsnew/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ Other API changes
- Made ``dtype`` a required argument in :meth:`ExtensionArray._from_sequence_of_strings` (:issue:`56519`)
- Passing a :class:`Series` input to :func:`json_normalize` will now retain the :class:`Series` :class:`Index`, previously output had a new :class:`RangeIndex` (:issue:`51452`)
- Removed :meth:`Index.sort` which always raised a ``TypeError``. This attribute is not defined and will raise an ``AttributeError`` (:issue:`59283`)
- Unused ``dtype`` argument has been removed from the :class:`MultiIndex` constructor (:issue:`60962`)
- Updated :meth:`DataFrame.to_excel` so that the output spreadsheet has no styling. Custom styling can still be done using :meth:`Styler.to_excel` (:issue:`54154`)
- pickle and HDF (``.h5``) files created with Python 2 are no longer explicitly supported (:issue:`57387`)
- pickled objects from pandas version less than ``1.0.0`` are no longer supported (:issue:`57155`)
Expand Down Expand Up @@ -818,6 +819,7 @@ Other
- Bug in :meth:`DataFrame.transform` that was returning the wrong order unless the index was monotonically increasing. (:issue:`57069`)
- Bug in :meth:`DataFrame.where` where using a non-bool type array in the function would return a ``ValueError`` instead of a ``TypeError`` (:issue:`56330`)
- Bug in :meth:`Index.sort_values` when passing a key function that turns values into tuples, e.g. ``key=natsort.natsort_key``, would raise ``TypeError`` (:issue:`56081`)
- Bug in :meth:`MultiIndex.fillna` error message was referring to ``isna`` instead of ``fillna`` (:issue:`60974`)
- Bug in :meth:`Series.diff` allowing non-integer values for the ``periods`` argument. (:issue:`56607`)
- Bug in :meth:`Series.dt` methods in :class:`ArrowDtype` that were returning incorrect values. (:issue:`57355`)
- Bug in :meth:`Series.isin` raising ``TypeError`` when series is large (>10**6) and ``values`` contains NA (:issue:`60678`)
Expand Down
5 changes: 1 addition & 4 deletions pandas/core/indexes/multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ class MultiIndex(Index):
level).
names : optional sequence of objects
Names for each of the index levels. (name is accepted for compat).
dtype : Numpy dtype or pandas type, optional
Data type for the MultiIndex.
copy : bool, default False
Copy the meta-data.
name : Label
Expand Down Expand Up @@ -305,7 +303,6 @@ def __new__(
codes=None,
sortorder=None,
names=None,
dtype=None,
copy: bool = False,
name=None,
verify_integrity: bool = True,
Expand Down Expand Up @@ -1760,7 +1757,7 @@ def fillna(self, value):
"""
fillna is not implemented for MultiIndex
"""
raise NotImplementedError("isna is not defined for MultiIndex")
raise NotImplementedError("fillna is not defined for MultiIndex")

@doc(Index.dropna)
def dropna(self, how: AnyAll = "any") -> MultiIndex:
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/base/test_fillna.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_fillna(index_or_series_obj):
obj = index_or_series_obj

if isinstance(obj, MultiIndex):
msg = "isna is not defined for MultiIndex"
msg = "fillna is not defined for MultiIndex"
with pytest.raises(NotImplementedError, match=msg):
obj.fillna(0)
return
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/indexes/multi/test_missing.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def test_fillna(idx):
# GH 11343
msg = "isna is not defined for MultiIndex"
msg = "fillna is not defined for MultiIndex"
with pytest.raises(NotImplementedError, match=msg):
idx.fillna(idx[0])

Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/indexes/test_old_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ def test_fillna(self, index):
pytest.skip(f"Not relevant for Index with {index.dtype}")
elif isinstance(index, MultiIndex):
idx = index.copy(deep=True)
msg = "isna is not defined for MultiIndex"
msg = "fillna is not defined for MultiIndex"
with pytest.raises(NotImplementedError, match=msg):
idx.fillna(idx[0])
else:
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/indexing/multiindex/test_loc.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def test_loc_getitem_series(self):
empty = Series(data=[], dtype=np.float64)
expected = Series(
[],
index=MultiIndex(levels=index.levels, codes=[[], []], dtype=np.float64),
index=MultiIndex(levels=index.levels, codes=[[], []]),
dtype=np.float64,
)
result = x.loc[empty]
Expand All @@ -129,7 +129,7 @@ def test_loc_getitem_array(self):
empty = np.array([])
expected = Series(
[],
index=MultiIndex(levels=index.levels, codes=[[], []], dtype=np.float64),
index=MultiIndex(levels=index.levels, codes=[[], []]),
dtype="float64",
)
result = x.loc[empty]
Expand Down
2 changes: 0 additions & 2 deletions web/pandas/about/team.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ If you want to support pandas development, you can find information in the [dona
## Governance

Wes McKinney is the Benevolent Dictator for Life (BDFL).

The project governance is available in the [project governance page]({{ base_url }}about/governance.html).

## Workgroups
Expand Down
4 changes: 1 addition & 3 deletions web/pandas/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,14 @@ workgroups:
contact: infrastructure@pandas.pydata.org
responsibilities: "Keep the pandas infrastructure up and working. In particular the servers for the website, benchmarks, CI and others needed."
members:
- Marc Garcia
- Matthew Roeschke
- William Ayd
- Thomas Li
communications:
name: Communications
contact: communications@pandas.pydata.org
responsibilities: "Share relevant information with the broader community, mainly via our social networks, as well as being the main point of contact between NumFOCUS and the core team."
members:
- Marco Gorelli
- Marc Garcia
sponsors:
active:
- name: "NumFOCUS"
Expand Down

0 comments on commit 705c0c5

Please sign in to comment.