From 1826c2cd1a803dee9ab142b94409aece8f6b7ec1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 2 Jul 2020 04:06:05 -0400 Subject: [PATCH] Force shapely check to true, to fix build. This fails because Shapely is some beta version in F32, which doesn't compare correctly. --- force-shapely-check-true.patch | 13 +++++++++++++ python-geopandas.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 force-shapely-check-true.patch diff --git a/force-shapely-check-true.patch b/force-shapely-check-true.patch new file mode 100644 index 0000000..71098b3 --- /dev/null +++ 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 diff --git a/python-geopandas.spec b/python-geopandas.spec index 05661d9..d82fc24 100644 --- 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