From a7c3bafe50710ad5ffb2a3a2d5e7b9d0cdae99f2 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 6 Jul 2018 23:43:59 -0500 Subject: [PATCH] TST: fix the tests for >= python 3.6 (#759) --- geopandas/tests/test_geom_methods.py | 2 +- geopandas/tests/test_testing.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geopandas/tests/test_geom_methods.py b/geopandas/tests/test_geom_methods.py index b94ca65..c1da4db 100644 --- a/geopandas/tests/test_geom_methods.py +++ b/geopandas/tests/test_geom_methods.py @@ -522,7 +522,7 @@ class TestGeomMethods: test_df = df.explode() expected_s = GeoSeries([Point(1, 2), Point(2, 3), Point(5, 5)]) - expected_df = GeoDataFrame({'geometry': expected_s, 'col': [1, 1, 2]}) + expected_df = GeoDataFrame({'col': [1, 1, 2], 'geometry': expected_s}) expected_index = MultiIndex(levels=[[0, 1], [0, 1]], labels=[[0, 0, 1], [0, 1, 0]], names=[index_name, None]) diff --git a/geopandas/tests/test_testing.py b/geopandas/tests/test_testing.py index 19e0301..c82dbea 100644 --- a/geopandas/tests/test_testing.py +++ b/geopandas/tests/test_testing.py @@ -12,8 +12,8 @@ s1 = GeoSeries([Polygon([(0, 0), (2, 0), (2, 2), (0, 2)]), s2 = GeoSeries([Polygon([(0, 2), (0, 0), (2, 0), (2, 2)]), Polygon([(2, 2), (4, 2), (4, 4), (2, 4)])]) -df1 = GeoDataFrame({'geometry': s1, 'col1': [1, 2]}) -df2 = GeoDataFrame({'geometry': s2, 'col1': [1, 2]}) +df1 = GeoDataFrame({'col1': [1, 2], 'geometry': s1}) +df2 = GeoDataFrame({'col1': [1, 2], 'geometry': s2}) def test_geoseries():