Merge pull request #137 from pycompression/fixwin

Try to fix windows CI

Author: rhpvorderman

.github/workflows/ci.yml

@@ -69,8 +69,8 @@ jobs:
         include:
           - os: "macos-latest"
             python-version: 3.7
-#          - os: "windows-latest"
-#            python-version: 3.7
+          - os: "windows-latest"
+            python-version: 3.7
     steps:
       - uses: actions/[email protected]
         with:

CHANGELOG.rst

@@ -9,6 +9,9 @@ Changelog
 
 version 1.2.0-dev
 -----------------
++ Simplify build setup. ISA-L release flags are now used and not
+  overwritten with python release flags when building the included static
+  library.
 + Fix bug where zdict's could not be set for ``isal_zlib.decompressobj`` and
   ``igzip_lib.IgzipDecompressor``.
 + Escape GIL when calling inflate, deflate, crc32 and adler32 functions to

setup.py

@@ -6,7 +6,6 @@
 # This file is part of python-isal which is distributed under the
 # PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2.
 
-import copy
 import functools
 import os
 import shutil
@@ -72,19 +71,7 @@ def build_extension(self, ext):
                 raise NotImplementedError(
                     f"Unsupported platform: {sys.platform}")
         else:
-            if self.compiler.compiler_type == "msvc":
-                compiler = copy.deepcopy(self.compiler)
-                if not compiler.initialized:
-                    compiler.initialize()
-                compiler_command = f'"{compiler.cc}"'
-                compiler_args = compiler.compile_options
-            elif self.compiler.compiler_type == "unix":
-                compiler_command = self.compiler.compiler[0]
-                compiler_args = self.compiler.compiler[1:]
-            else:
-                raise NotImplementedError("Unknown compiler")
-            isa_l_prefix_dir = build_isa_l(compiler_command,
-                                           " ".join(compiler_args))
+            isa_l_prefix_dir = build_isa_l()
             if SYSTEM_IS_UNIX:
                 ext.extra_objects = [
                     os.path.join(isa_l_prefix_dir, "lib", "libisal.a")]
@@ -106,7 +93,7 @@ def build_extension(self, ext):
 # 'cache' is only available from python 3.9 onwards.
 # see: https://docs.python.org/3/library/functools.html#functools.cache
 @functools.lru_cache(maxsize=None)
-def build_isa_l(compiler_command: str, compiler_options: str):
+def build_isa_l():
     # Check for cache
     if BUILD_CACHE:
         if BUILD_CACHE_FILE.exists():
@@ -122,14 +109,8 @@ def build_isa_l(compiler_command: str, compiler_options: str):
     # Build environment is a copy of OS environment to allow user to influence
     # it.
     build_env = os.environ.copy()
-    # Add -fPIC flag to allow static compilation
-    build_env["CC"] = compiler_command
     if SYSTEM_IS_UNIX:
-        build_env["CFLAGS"] = compiler_options + " -fPIC"
-    elif SYSTEM_IS_WINDOWS:
-        # The nmake file has CLFAGS_REL for all the compiler options.
-        # This is added to CFLAGS with all the necessary include options.
-        build_env["CFLAGS_REL"] = compiler_options
+        build_env["CFLAGS"] = build_env.get("CFLAGS", "") + " -O2 -fPIC"
     if hasattr(os, "sched_getaffinity"):
         cpu_count = len(os.sched_getaffinity(0))
     else:  # sched_getaffinity not available on all platforms
@@ -142,7 +123,8 @@ def build_isa_l(compiler_command: str, compiler_options: str):
         subprocess.run(["make", "-j", str(cpu_count)], **run_args)
         subprocess.run(["make", "-j", str(cpu_count), "install"], **run_args)
     elif SYSTEM_IS_WINDOWS:
-        subprocess.run(["nmake", "/E", "/f", "Makefile.nmake"], **run_args)
+        print(build_env, file=sys.stderr)
+        subprocess.run(["nmake", "/f", "Makefile.nmake"], **run_args)
         Path(temp_prefix, "include").mkdir()
         print(temp_prefix, file=sys.stderr)
         shutil.copytree(os.path.join(build_dir, "include"),

tox.ini

@@ -8,8 +8,10 @@ isolated_build=True
 [testenv]
 deps=pytest
      coverage
+# Pass windows env variable for includes
 passenv=
     PYTHON_ISAL_LINK_DYNAMIC
+    INCLUDE
 commands =
     # Create HTML coverage report for humans and xml coverage report for external services.
     coverage run --branch --source=isal -m pytest tests