750a904925
Backport upstream PR’s #2219, #2289, #2298, and #2320 in order to resolve test failures with pandas 1.4. It seems that PR#2320 may also be needed for pandas 1.3.5, which should have been a compatible release.
21 lines
788 B
Diff
21 lines
788 B
Diff
From 197617180d78e72f6c8699dbde0ed7cff1c3c34e Mon Sep 17 00:00:00 2001
|
|
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
|
|
Date: Sun, 23 Jan 2022 10:35:25 +0100
|
|
Subject: [PATCH] TST: skip pandas groupby test if no sindex available
|
|
|
|
---
|
|
geopandas/tests/test_pandas_methods.py | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py
|
|
index 72dbcffc0..42c79de7e 100644
|
|
--- a/geopandas/tests/test_pandas_methods.py
|
|
+++ b/geopandas/tests/test_pandas_methods.py
|
|
@@ -558,6 +558,7 @@ def test_groupby_groups(df):
|
|
assert_frame_equal(res, exp)
|
|
|
|
|
|
+@pytest.mark.skip_no_sindex
|
|
@pytest.mark.skipif(
|
|
compat.PANDAS_GE_13 and not compat.PANDAS_GE_14,
|
|
reason="this was broken in pandas 1.3.5 (GH-2294)",
|