Skip to content

Commit 3c60e46

Browse files
committed
Merge branch 'main' into api-nan-vs-na
2 parents 3482399 + 3ea783e commit 3c60e46

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
163163

164164
- name: Build wheels
165-
uses: pypa/[email protected].1
165+
uses: pypa/[email protected].3
166166
with:
167167
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
168168
env:

pandas/core/common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ def consensus_name_attr(objs):
9191
try:
9292
if obj.name != name:
9393
name = None
94+
break
9495
except ValueError:
9596
name = None
97+
break
9698
return name
9799

98100

pandas/tests/series/methods/test_case_when.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import pytest
33

44
from pandas import (
5+
NA,
56
DataFrame,
67
Series,
78
array as pd_array,
@@ -99,7 +100,7 @@ def test_case_when_multiple_conditions_replacement_extension_dtype(df):
99100
(df["a"].gt(1) & df["b"].eq(5), pd_array([1, 2, 3], dtype="Int64")),
100101
],
101102
)
102-
expected = Series([1, 2, np.nan], dtype="Float64")
103+
expected = Series([1, 2, NA], dtype="Float64")
103104
tm.assert_series_equal(result, expected)
104105

105106

0 commit comments

Comments
 (0)