Merge branch 'rawhide' into f32

Merge branch 'master' into f32
Force shapely check to true, to fix build.
2021-02-06 01:46:28 -05:00 · 2020-07-16 04:38:49 -04:00 · 2020-07-02 04:06:05 -04:00
2 changed files with 16 additions and 0 deletions
--- a/force-shapely-check-true.patch
+++ b/force-shapely-check-true.patch
@ -0,0 +1,13 @@
+diff --git a/geopandas/_compat.py b/geopandas/_compat.py
+index fa86961..8cb4fc7 100644
+--- a/geopandas/_compat.py
+++ b/geopandas/_compat.py
+@@ -21,7 +21,7 @@ PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0.dev")
+ # -----------------------------------------------------------------------------
+ 
+ 
+-SHAPELY_GE_17 = str(shapely.__version__) >= LooseVersion("1.7.0")
+SHAPELY_GE_17 = True
+ 
+ HAS_PYGEOS = None
+ USE_PYGEOS = None
--- a/python-geopandas.spec
+++ b/python-geopandas.spec
@ -17,6 +17,9 @@ License:        BSD
 URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz
 Patch0001:      0001-Skip-test_overlay_nybb-on-broken-platforms.patch
+# Force shapely check to True, because the shapely version is a beta that
+# doesn't compare correctly.
+Patch0002:      force-shapely-check-true.patch

 BuildArch:      noarch
Author	SHA1	Message	Date
Elliott Sales de Andrade	998bf24ae6	Merge branch 'rawhide' into f32	2021-02-06 01:46:28 -05:00
Elliott Sales de Andrade	813af7903d	Merge branch 'master' into f32	2020-07-16 04:38:49 -04:00
Elliott Sales de Andrade	1826c2cd1a	Force shapely check to true, to fix build. This fails because Shapely is some beta version in F32, which doesn't compare correctly.	2020-07-02 04:06:05 -04:00