Skip to content

Commit e503fea

Browse files
authored
Merge branch '2.2.x' into auto-backport-of-pr-59065-on-2.2.x
2 parents 679e45e + e5a2067 commit e503fea

File tree

3 files changed

+44
-1
lines changed

3 files changed

+44
-1
lines changed

doc/source/whatsnew/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Version 2.2
1616
.. toctree::
1717
:maxdepth: 2
1818

19+
v2.2.3
1920
v2.2.2
2021
v2.2.1
2122
v2.2.0

doc/source/whatsnew/v2.2.3.rst

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
.. _whatsnew_223:
2+
3+
What's new in 2.2.3 (September XX, 2024)
4+
----------------------------------------
5+
6+
These are the changes in pandas 2.2.3. See :ref:`release` for a full changelog
7+
including other versions of pandas.
8+
9+
{{ header }}
10+
11+
.. ---------------------------------------------------------------------------
12+
.. _whatsnew_223.regressions:
13+
14+
Fixed regressions
15+
~~~~~~~~~~~~~~~~~
16+
-
17+
18+
.. ---------------------------------------------------------------------------
19+
.. _whatsnew_223.bug_fixes:
20+
21+
Bug fixes
22+
~~~~~~~~~
23+
-
24+
25+
.. ---------------------------------------------------------------------------
26+
.. _whatsnew_223.other:
27+
28+
Other
29+
~~~~~
30+
-
31+
32+
.. ---------------------------------------------------------------------------
33+
.. _whatsnew_223.contributors:
34+
35+
Contributors
36+
~~~~~~~~~~~~

pandas/tests/series/indexing/test_setitem.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
datetime,
44
)
55
from decimal import Decimal
6+
import os
67

78
import numpy as np
89
import pytest
910

11+
from pandas.compat import WASM
1012
from pandas.compat.numpy import np_version_gte1p24
1113
from pandas.errors import IndexingError
1214

@@ -1443,7 +1445,11 @@ def obj(self):
14431445
marks=pytest.mark.xfail(
14441446
(
14451447
not np_version_gte1p24
1446-
or (np_version_gte1p24 and np._get_promotion_state() != "weak")
1448+
or (
1449+
np_version_gte1p24
1450+
and os.environ.get("NPY_PROMOTION_STATE", "weak") != "weak"
1451+
)
1452+
or WASM
14471453
),
14481454
reason="np.float32(1.1) ends up as 1.100000023841858, so "
14491455
"np_can_hold_element raises and we cast to float64",

0 commit comments

Comments
 (0)