diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index fe43688..9085a3c 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,4 +1,4 @@ -From 44aeb741aba986fcc6b1bceb85d49131d35e00f5 Mon Sep 17 00:00:00 2001 +From d79b414d398651c4c2531012a7ab318209a0065f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 Subject: [PATCH] Skip test_overlay_nybb on broken platforms. @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index b344fed..b40e9b3 100644 +index 467fbb9..e26c00a 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py @@ -1,4 +1,5 @@ @@ -18,16 +18,16 @@ index b344fed..b40e9b3 100644 import pandas as pd -@@ -100,6 +101,9 @@ def test_overlay(dfs_index, how): - assert_geodataframe_equal(result, expected, check_column_type=False) +@@ -107,6 +108,9 @@ def test_overlay(dfs_index, how): - -+@pytest.mark.xfail( -+ platform.machine() in ('aarch64', 'ppc64', 'ppc64le', 's390x'), -+ reason='platform-specific problems') @pytest.mark.filterwarnings("ignore:GeoSeries crs mismatch:UserWarning") def test_overlay_nybb(how): ++ if how != 'difference' and platform.machine() in ('aarch64', 'ppc64le', 's390x'): ++ pytest.xfail('platform-specific problems') ++ polydf = read_file(geopandas.datasets.get_path("nybb")) + + # construct circles dataframe -- -2.21.1 +2.25.4 diff --git a/python-geopandas.spec b/python-geopandas.spec index 3465cd5..383dda8 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -55,8 +55,7 @@ BuildRequires: python3-matplotlib >= 2.0.1 %check -PYTHONPATH="%{buildroot}%{python3_sitelib}" \ - py.test-%{python3_version} -ra geopandas -m 'not web' +%{pytest} -ra geopandas -m 'not web' %files -n python3-%{srcname} @@ -67,6 +66,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Fri Jul 17 2020 Elliott Sales de Andrade - 0.8.1-2 +- Fix alternate architecture patch. + * Thu Jul 16 2020 Elliott Sales de Andrade - 0.8.1-1 - Update to latest version