diff --git a/.gitignore b/.gitignore index 1fb0bed..fa75941 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /geopandas-0.6.0rc1.tar.gz /geopandas-0.6.0.tar.gz /geopandas-0.6.3.tar.gz +/geopandas-0.7.0.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index 960c9ec..fe43688 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 10bb559a63a926213f253ac085a0d973a70eb32a Mon Sep 17 00:00:00 2001 +From 44aeb741aba986fcc6b1bceb85d49131d35e00f5 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,27 +9,25 @@ 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 c99a3d9..488fc41 100644 +index b344fed..b40e9b3 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py -@@ -1,6 +1,7 @@ - from __future__ import absolute_import - +@@ -1,4 +1,5 @@ import os +import platform import pandas as pd -@@ -102,6 +103,9 @@ def test_overlay(dfs_index, how, use_sindex): +@@ -100,6 +101,9 @@ def test_overlay(dfs_index, how): assert_geodataframe_equal(result, expected, check_column_type=False) +@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): polydf = read_file(geopandas.datasets.get_path("nybb")) - -- -2.21.0 +2.21.1 diff --git a/python-geopandas.spec b/python-geopandas.spec index 6e3d70c..e1e2fe2 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.6.3 +Version: 0.7.0 Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ @@ -28,19 +28,16 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel -BuildRequires: python3-six >= 1.3.0 BuildRequires: python3-descartes BuildRequires: python3-fiona >= 1.0.1 -BuildRequires: python3-pandas >= 0.23.4 -BuildRequires: python3-pyproj >= 1.9.3 +BuildRequires: python3-pandas >= 0.23 +BuildRequires: python3-pyproj >= 2.2 BuildRequires: python3-shapely >= 1.2.18 BuildRequires: python3-pytest BuildRequires: python3-rtree >= 0.8 BuildRequires: python3-matplotlib >= 2.0.1 -Requires: python3-six >= 1.3.0 - %description -n python3-%{srcname} %{_description} @@ -69,6 +66,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Tue Feb 18 2020 Elliott Sales de Andrade - 0.7.0-1 +- Update to latest version + * Sat Feb 08 2020 Elliott Sales de Andrade - 0.6.3-1 - Update to latest version diff --git a/sources b/sources index c501db1..e87d1e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.6.3.tar.gz) = 3c9267feba3535d9725c61f26cd48146582f21f684a70e8b1c5a85d08c04a3e999722c6877cf073ab6177d16f0c4bdbc0324b9799a146307fc568e8b360a2dfa +SHA512 (geopandas-0.7.0.tar.gz) = 037b33f156179e1ca02ed82d0aaa2e6fc5d19e26f16a804d6f156a10715f4791e720fbf8d36e225b7333b599bf4f1f4b8b334cdbd7b8044fc9452aa336f2d1cc