rpms/python-geopandas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add patch to build against Pandas 0.23.0.

Browse source
This commit is contained in:
Elliott Sales de Andrade 2018-07-11 21:27:16 -04:00
commit e260b2af10
5 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
0001-Fix-default-cmap-for-Matplotlib-2.0.0.patch
View file

@ -1,7 +1,7 @@
From ff44cd10b0e3bcdb583c034f8450507ed4a461c8 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 19 Sep 2017 00:48:06 -0400
Subject: [PATCH 1/3] Fix default cmap for Matplotlib 2.0.0.
Subject: [PATCH 1/4] Fix default cmap for Matplotlib 2.0.0.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@ -26,5 +26,5 @@ index 31b6284..a198e50 100644
cmap = 'Set1'
categories = list(set(df[column].values))
--
2.13.6
2.17.1

4
0002-TST-Fix-determination-of-expected-dash-style.patch
View file

@ -1,7 +1,7 @@
From f1ccfb43a0d0cc400474a60d984e653dfd292063 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 19 Sep 2017 01:02:43 -0400
Subject: [PATCH 2/3] TST: Fix determination of expected dash style.
Subject: [PATCH 2/4] TST: Fix determination of expected dash style.
In Matplotlib 2.0.0, there was a minimum dash length that was eventually
removed because it was problematic. The expected line style does not
@ -83,5 +83,5 @@ index b3f98b7..03ab184 100644
from matplotlib.backend_bases import GraphicsContextBase
return GraphicsContextBase.dashd[linestyle]
--
2.13.6
2.17.1

4
0003-Workaround-test-issues-on-non-x86-systems.patch
View file

@ -1,7 +1,7 @@
From 0e9bc3047ad66778835ee5ad2d7d767ac1caec24 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 28 Nov 2017 02:24:32 -0500
Subject: [PATCH 3/3] Workaround test issues on non-x86 systems.
Subject: [PATCH 3/4] Workaround test issues on non-x86 systems.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@ -69,5 +69,5 @@ index d928224..fc7ae2e 100644
def test_bad_how(self):
with pytest.raises(ValueError):
--
2.13.6
2.17.1

32
0004-BUG-fix-GeoSeries-construction-from-scalar-on-pandas.patch Normal file
View file

@ -0,0 +1,32 @@
From dd1b97cd2edb24b6940b04dafe1ce48ab54bfc69 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Sat, 17 Mar 2018 20:11:57 +0100
Subject: [PATCH 4/4] BUG: fix GeoSeries construction from scalar on pandas
master (#692)
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
geopandas/geoseries.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/geopandas/geoseries.py b/geopandas/geoseries.py
index 2b70752..99df5f2 100644
--- a/geopandas/geoseries.py
+++ b/geopandas/geoseries.py
@@ -32,9 +32,11 @@ class GeoSeries(GeoPandasBase, Series):
return arr.view(GeoSeries)
def __init__(self, *args, **kwargs):
- # fix problem for scalar geometries passed
+ # fix problem for scalar geometries passed, ensure the list of
+ # scalars is of correct length if index is specified
if len(args) == 1 and isinstance(args[0], BaseGeometry):
- args = ([args[0]],)
+ n = len(kwargs.get('index', [1]))
+ args = ([args[0]] * n,)
crs = kwargs.pop('crs', None)
--
2.17.1

5
python-geopandas.spec
View file

@ -21,6 +21,8 @@ Patch0001: 0001-Fix-default-cmap-for-Matplotlib-2.0.0.patch
Patch0002: 0002-TST-Fix-determination-of-expected-dash-style.patch
# https://github.com/geopandas/geopandas/issues/552
Patch0003: 0003-Workaround-test-issues-on-non-x86-systems.patch
# https://github.com/geopandas/geopandas/pull/692
Patch0004: 0004-BUG-fix-GeoSeries-construction-from-scalar-on-pandas.patch
BuildArch: noarch
@ -128,6 +130,9 @@ PYTHONPATH="%{buildroot}%{python2_sitelib}" \
%changelog
* Wed Jul 11 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.3.0-6
- Add patch to build against Pandas 0.23.0
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.3.0-6
- Rebuilt for Python 3.7