Blob Blame History Raw
diff -rupN --no-dereference Shapely-1.7.1/setup.py Shapely-1.7.1-new/setup.py
--- Shapely-1.7.1/setup.py	2020-08-20 22:02:11.000000000 +0200
+++ Shapely-1.7.1-new/setup.py	2020-11-05 23:51:43.291074324 +0100
@@ -82,7 +82,8 @@ if not (py_version == (2, 7) or py_versi
 
 # Get geos_version from GEOS dynamic library, which depends on
 # GEOS_LIBRARY_PATH and/or GEOS_CONFIG environment variables
-from shapely._buildcfg import geos_version_string, geos_version, \
+if not os.environ.get('NO_GEOS_CHECK'):
+    from shapely._buildcfg import geos_version_string, geos_version, \
         geos_config, get_geos_config
 
 logging.basicConfig()
diff -rupN --no-dereference Shapely-1.7.1/shapely/geos.py Shapely-1.7.1-new/shapely/geos.py
--- Shapely-1.7.1/shapely/geos.py	2020-08-20 22:02:11.000000000 +0200
+++ Shapely-1.7.1-new/shapely/geos.py	2020-11-05 23:51:43.292074329 +0100
@@ -158,10 +158,11 @@ elif sys.platform == 'win32':
                     os.path.abspath(sys.executable + '../../DLLS'))
             else:
                 wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
+            bindir="../../../bin"
             original_path = os.environ['PATH']
-            os.environ['PATH'] = "%s;%s;%s" % \
-                (egg_dlls, wininst_dlls, original_path)
-            _lgeos = load_dll("geos_c.dll")
+            os.environ['PATH'] = "%s;%s;%s;%s" % \
+                (egg_dlls, wininst_dlls, bindir, original_path)
+            _lgeos = load_dll("libgeos_c-1.dll")
         except (ImportError, WindowsError, OSError):
             raise