Merge pull request #104 from pycompression/windowsheader

Include isa-l.h on windows as well

Author: rhpvorderman

CHANGELOG.rst

@@ -9,6 +9,7 @@ Changelog
 
 version 1.0.0-dev
 ------------------
++ ISA-L library version variables are now available on windows as well.
 + Wheels are now always build with nasm for the x86 architecture. Previously
   yasm was used for Linux and MacOS due to build issues that have since been
   fixed upstream.

setup.py

@@ -55,10 +55,9 @@ def cythonize_modules():
     modules = [Extension("isal.isal_zlib", ["src/isal/isal_zlib.pyx"],
                          **extension_args),
                Extension("isal.igzip_lib", ["src/isal/igzip_lib.pyx"],
+                         **extension_args),
+               Extension("isal._isal", ["src/isal/_isal.pyx"],
                          **extension_args)]
-    if SYSTEM_IS_UNIX:
-        modules.append(Extension("isal._isal", ["src/isal/_isal.pyx"],
-                                 **extension_args))
     return cythonize(modules, compiler_directives=compiler_directives)
 
 
@@ -167,6 +166,8 @@ def build_isa_l(compiler_command: str, compiler_options: str):
                         Path(temp_prefix, "include", "isa-l"))
         shutil.copy(os.path.join(build_dir, "isa-l_static.lib"),
                     os.path.join(temp_prefix, "isa-l_static.lib"))
+        shutil.copy(os.path.join(build_dir, "isa-l.h"),
+                    os.path.join(temp_prefix, "include", "isa-l.h"))
     else:
         raise NotImplementedError(f"Unsupported platform: {sys.platform}")
     shutil.rmtree(build_dir)

src/isal/__init__.py

@@ -17,19 +17,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-from typing import Optional
 
-try:
-    from . import _isal
-    ISAL_MAJOR_VERSION: Optional[int] = _isal.ISAL_MAJOR_VERSION
-    ISAL_MINOR_VERSION: Optional[int] = _isal.ISAL_MINOR_VERSION
-    ISAL_PATCH_VERSION: Optional[int] = _isal.ISAL_PATCH_VERSION
-    ISAL_VERSION: Optional[str] = _isal.ISAL_VERSION
-except ImportError:  # isa-l.h not available on windows
-    ISAL_MAJOR_VERSION = None
-    ISAL_MINOR_VERSION = None
-    ISAL_PATCH_VERSION = None
-    ISAL_VERSION = None
+from . import _isal
+
+ISAL_MAJOR_VERSION: int = _isal.ISAL_MAJOR_VERSION
+ISAL_MINOR_VERSION: int = _isal.ISAL_MINOR_VERSION
+ISAL_PATCH_VERSION: int = _isal.ISAL_PATCH_VERSION
+ISAL_VERSION: str = _isal.ISAL_VERSION
+
 
 __all__ = [
     "ISAL_MAJOR_VERSION",

tests/test_zlib_compliance.py

@@ -43,12 +43,7 @@ def test_library_version(self):
         # the minor versions will match (even on the machine on which the
         # module was compiled), and the API is stable between minor versions,
         # so testing only the major versions avoids spurious failures.
-        # TODO: Ask for isal current version upstream
-        if sys.platform.startswith("win"):
-            # No isa-l.h on windows, so no version information there.
-            self.assertEqual(isal.ISAL_MAJOR_VERSION, None)
-        else:
-            self.assertEqual(isal.ISAL_MAJOR_VERSION, 2)
+        self.assertEqual(isal.ISAL_MAJOR_VERSION, 2)
 
 
 class ChecksumTestCase(unittest.TestCase):