Skip to content

Commit 35121e2

Browse files
committed
BUG: mergeasof() now accepts datetime.timedelta as tolerance kwarg (#28098)
1 parent 3059625 commit 35121e2

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pandas/tests/reshape/merge/test_merge_asof.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,7 @@ def test_non_sorted(self):
594594
"tolerance",
595595
[
596596
Timedelta("1day"),
597-
pytest.param(
598-
datetime.timedelta(days=1),
599-
marks=pytest.mark.xfail(reason="not implemented", strict=True),
600-
),
597+
datetime.timedelta(days=1),
601598
],
602599
ids=["pd.Timedelta", "datetime.timedelta"],
603600
)

test_fast.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# https://github.com/pytest-dev/pytest/issues/1075
66
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
77

8-
pytest pandas --skip-slow --skip-network --skip-db -m "not single" -n 4 -r sxX --strict "$@"
8+
pytest pandas --skip-slow --skip-network --skip-db -m "not single" -n 16 -r sxX --strict "$@"

0 commit comments

Comments
 (0)