[Git][debian-gis-team/python-geopandas][master] 2 commits: Tests: ignore int32 vs int64 (closes: #1063435)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-geopandas


Commits:
aaf5461f by Bas Couwenberg at 2024-02-17T08:31:22+01:00
Tests: ignore int32 vs int64 (closes: #1063435)

- - - - -
fcaf2823 by Bas Couwenberg at 2024-02-17T08:31:37+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/pandas2_compat.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+python-geopandas (0.14.3-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Rebecca N. Palmer ]
+  * Tests: ignore int32 vs int64 (closes: #1063435)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 17 Feb 2024 08:31:24 +0100
+
 python-geopandas (0.14.3-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/pandas2_compat.patch
=====================================
@@ -0,0 +1,80 @@
+Description: Ignore int64 vs int_nativesize mismatches
+ Introduced by pandas 2.x
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/1063435
+Forwarded: https://github.com/geopandas/geopandas/issues/3189
+
+--- a/geopandas/tests/test_geom_methods.py
++++ b/geopandas/tests/test_geom_methods.py
+@@ -1384,7 +1384,7 @@ class TestGeomMethods:
+             names=[index_name, None],
+         )
+         expected_df = expected_df.set_index(expected_index)
+-        assert_frame_equal(test_df, expected_df)
++        assert_frame_equal(test_df, expected_df, check_index_type=False)
+ 
+     @pytest.mark.parametrize("index_name", [None, "test"])
+     def test_explode_geodataframe_level_1(self, index_name):
+@@ -1403,7 +1403,7 @@ class TestGeomMethods:
+             names=[index_name, None],
+         )
+         expected_df = expected_df.set_index(expected_index)
+-        assert_frame_equal(test_df, expected_df)
++        assert_frame_equal(test_df, expected_df, check_index_type=False)
+ 
+     @pytest.mark.parametrize("index_name", [None, "test"])
+     def test_explode_geodataframe_no_multiindex(self, index_name):
+@@ -1509,7 +1509,7 @@ class TestGeomMethods:
+             names=["first", "second", None],
+         )
+         expected_df = expected_df.set_index(expected_index)
+-        assert_frame_equal(test_df, expected_df)
++        assert_frame_equal(test_df, expected_df, check_index_type=False)
+ 
+     @pytest.mark.parametrize("outer_index", [1, (1, 2), "1"])
+     def test_explode_pandas_multi_index_false(self, outer_index):
+@@ -1610,7 +1610,7 @@ class TestGeomMethods:
+             geometry=expected_geometry,
+             index=expected_index,
+         )
+-        assert_geodataframe_equal(test_df, expected_df)
++        assert_geodataframe_equal(test_df, expected_df, check_index_type=False)
+ 
+     def test_explode_order_no_multi(self):
+         df = GeoDataFrame(
+@@ -1628,7 +1628,7 @@ class TestGeomMethods:
+             geometry=[Point(0, x) for x in range(3)],
+             index=expected_index,
+         )
+-        assert_geodataframe_equal(test_df, expected_df)
++        assert_geodataframe_equal(test_df, expected_df, check_index_type=False)
+ 
+     def test_explode_order_mixed(self):
+         df = GeoDataFrame(
+@@ -1656,7 +1656,7 @@ class TestGeomMethods:
+             geometry=expected_geometry,
+             index=expected_index,
+         )
+-        assert_geodataframe_equal(test_df, expected_df)
++        assert_geodataframe_equal(test_df, expected_df, check_index_type=False)
+ 
+     def test_explode_duplicated_index(self):
+         df = GeoDataFrame(
+@@ -1684,7 +1684,7 @@ class TestGeomMethods:
+             geometry=expected_geometry,
+             index=expected_index,
+         )
+-        assert_geodataframe_equal(test_df, expected_df)
++        assert_geodataframe_equal(test_df, expected_df, check_index_type=False)
+ 
+     @pytest.mark.parametrize("geom_col", ["geom", "geometry"])
+     def test_explode_geometry_name(self, geom_col):
+@@ -1806,7 +1806,7 @@ class TestGeomMethods:
+                 ]
+             ),
+         )
+-        assert_frame_equal(self.g11.get_coordinates(index_parts=True), expected)
++        assert_frame_equal(self.g11.get_coordinates(index_parts=True), expected, check_index_type=False)
+ 
+     @pytest.mark.skipif(
+         (compat.USE_PYGEOS or compat.USE_SHAPELY_20),


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 no-gallery.patch
+pandas2_compat.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-geopandas/-/compare/3bc4a66efda7aa97cfa416f4ec7786ea5391f36b...fcaf28230196f31ad43a1b69c2e3a827f9717d6e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-geopandas/-/compare/3bc4a66efda7aa97cfa416f4ec7786ea5391f36b...fcaf28230196f31ad43a1b69c2e3a827f9717d6e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240217/7b349fdc/attachment-0001.htm>