Modify GeosLibrary so that it works in win_amd64

Author: molinav

packages/basemap/requirements-dev.txt

@@ -20,7 +20,6 @@ pytest >= 3.2, < 5.0; python_version == "3.4"
 pytest >= 3.2, < 6.3; python_version >= "3.5"
 
 coverage >= 3.7, < 4.0; python_version == "3.2"
-
 pytest-cov >= 2.5, < 2.6; python_version == "2.6"
 pytest-cov >= 2.5, < 3.0; python_version == "2.7"
 pytest-cov >= 2.5, < 2.6; python_version == "3.2"

packages/basemap/setup.py

@@ -6,6 +6,7 @@
 import io
 import os
 import sys
+import glob
 import warnings
 from setuptools import setup
 from setuptools import find_packages
@@ -76,9 +77,9 @@ def checkversion(directory):
             geos_installdir = folder
             break
 
-# Define GEOS include and library dirs.
+# Define GEOS include, library and runtime dirs.
 if geos_installdir is None:
-    warnings.warn("\n".join([
+    warnings.warn(" ".join([
         "Cannot find GEOS library in standard locations ('{0}').",
         "Please install the corresponding packages using your",
         "software management system or set the environment variable",
@@ -91,14 +92,19 @@ def checkversion(directory):
     include_dirs.append(os.path.join(geos_installdir, "include"))
     library_dirs.append(os.path.join(geos_installdir, "lib"))
     library_dirs.append(os.path.join(geos_installdir, "lib64"))
-
-# Define runtime library dirs.
-# Don't use runtime_library_dirs on windows (workaround for a distutils bug):
-#     http://bugs.python.org/issue2437)
-if sys.platform == "win32":
-    runtime_lib_dirs = []
-else:
-    runtime_lib_dirs = library_dirs
+    runtime_library_dirs = library_dirs
+    data_files = []
+    if os.name == "nt":
+        # On Windows:
+        # - DLLs get installed under `bin`.
+        # - We need to inject the DLL in the wheel using `data_files`.
+        # - We do not use `runtime_library_dirs` as workaround for a
+        #   `distutils` bug (http://bugs.python.org/issue2437).
+        library_dirs.append(os.path.join(geos_installdir, "bin"))
+        runtime_library_dirs = []
+        dlls = glob.glob(os.path.join(geos_installdir, "*", "geos_c.dll"))
+        if dlls:
+            data_files.append(("../..", sorted(dlls)))
 
 # Define `_geoslib` extension module. It cannot be installed in the
 # `mpl_toolkits.basemap` namespace or `Basemap` objects will not be pickleable.
@@ -117,7 +123,7 @@ def checkversion(directory):
         "library_dirs":
             library_dirs,
         "runtime_library_dirs":
-            runtime_lib_dirs,
+            runtime_library_dirs,
     }),
 ]
 
@@ -192,6 +198,8 @@ def checkversion(directory):
         find_packages(where="src"),
     "ext_modules":
         ext_modules,
+    "data_files":
+        data_files,
     "python_requires":
         ", ".join([
             ">=2.6",

packages/basemap/utils/GeosLibrary.py

@@ -105,7 +105,7 @@ def download(self):
             if date is not None:
                 os.utime(zippath, (date, date))
 
-    def decompress(self, overwrite=True):
+    def extract(self, overwrite=True):
         """Decompress GEOS zip source code into :class:`GeosLibrary` root."""
 
         # Download zip file if not present.
@@ -142,9 +142,9 @@ def decompress(self, overwrite=True):
     def build(self, installdir=None):
         """Build and install GEOS from source."""
 
-        # Download and decompress zip file if not present.
+        # Download and extract zip file if not present.
         zipfold = os.path.join(self.root, "geos-{0}".format(self.version))
-        self.decompress(overwrite=True)
+        self.extract(overwrite=True)
 
         # Define build directory.
         builddir = os.path.join(zipfold, "build")
@@ -154,6 +154,17 @@ def build(self, installdir=None):
             installdir = os.path.expanduser("~/.local/share/libgeos")
         installdir = os.path.abspath(installdir)
 
+        # Define configure options.
+        config_opts = [
+            "-DCMAKE_INSTALL_PREFIX={0}".format(installdir),
+            "-DGEOS_ENABLE_TESTS=OFF",
+        ]
+        if os.name == "nt":
+            config_opts.append("-DCMAKE_GENERATOR_PLATFORM=x64")
+            config_opts.append("-DCMAKE_GENERATOR_TOOLSET=host=x64")
+        else:
+            config_opts.append("-DCMAKE_BUILD_TYPE=Release")
+
         # Now move to the GEOS source code folder and build with CMake.
         cwd = os.getcwd()
         try:
@@ -164,10 +175,7 @@ def build(self, installdir=None):
                 pass
             os.chdir(builddir)
             # Call cmake configure.
-            subprocess.call(["cmake", "..",
-                             "-DCMAKE_BUILD_TYPE=Release",
-                             "-DCMAKE_INSTALL_PREFIX={0}".format(installdir),
-                             "-DGEOS_ENABLE_TESTS=OFF"])
+            subprocess.call(["cmake", ".."] + config_opts)
             # Ensure that the install directory exists.
             try:
                 os.makedirs(installdir)
@@ -176,6 +184,7 @@ def build(self, installdir=None):
             # Call cmake build and install.
             subprocess.call(["cmake",
                              "--build", ".",
+                             "--config", "Release",
                              "--target", "install"])
         finally:
             os.chdir(cwd)