ENH: Get tests passing on Cygwin.

There are a few other ways these changes could be made Tweak the regex to accept different file extensions Combine the Windows and Cygwin paths for adding .dll.a files
mesonbuild · DWesl · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022
commit b0f12d167944cb4489a04271cfc6ef45f53e4666
diff --git a/mesonpy/__init__.py b/mesonpy/__init__.py
@@ -99,6 +99,7 @@ def _init_colors() -> Dict[str, str]:
 
 
 _LINUX_NATIVE_MODULE_REGEX = re.compile(r'^(?P<name>.+)\.(?P<tag>.+)\.so$')
+_CYGWIN_NATIVE_MODULE_REGEX = re.compile(r'^(?P<name>.+)\.(?P<tag>.+)\.dll$')
 _WINDOWS_NATIVE_MODULE_REGEX = re.compile(r'^(?P<name>.+)\.(?P<tag>.+)\.pyd$')
 _STABLE_ABI_TAG_REGEX = re.compile(r'^abi(?P<abi_number>[0-9]+)$')
 
@@ -292,7 +293,7 @@ def _calculate_file_abi_tag_heuristic_posix(self, filename: str) -> Optional[mes
         # preventive and check its value to make sure it matches our expectations
         try:
             extension = sysconfig.get_config_vars().get('SHLIB_SUFFIX', '.so')
-            if extension != '.so':
+            if extension not in ('.so', '.dll'):
                 raise NotImplementedError(
                     f"We don't currently support the {extension} extension. "
                     'Please report this to https://github.com/FFY00/mesonpy/issues '
@@ -305,7 +306,10 @@ def _calculate_file_abi_tag_heuristic_posix(self, filename: str) -> Optional[mes
                 'Please report this to https://github.com/FFY00/mesonpy/issues '
                 'and include the output of `python -m sysconfig`.'
             )
-        match = _LINUX_NATIVE_MODULE_REGEX.match(filename)
+        if sys.platform == 'cygwin':
+            match = _CYGWIN_NATIVE_MODULE_REGEX.match(filename)
+        else:
+            match = _LINUX_NATIVE_MODULE_REGEX.match(filename)
         if not match:  # this file does not appear to be a native module
             return None
         tag = match.group('tag')

diff --git a/tests/test_wheel.py b/tests/test_wheel.py
@@ -102,7 +102,7 @@ def test_scipy_like(wheel_scipy_like):
             'mypkg/submod/__init__.py',
             'mypkg/submod/unknown_filetype.npq',
         }
-    if os.name == 'nt':
+    if os.name == 'nt' or sys.platform == 'cygwin':
         # Currently Meson is installing `.dll.a` (import libraries) next to
         # `.pyd` extension modules. Those are very small, so it's not a major
         # issue - just sloppy. For now, ensure we don't fail on those
@@ -154,6 +154,8 @@ def test_purelib_and_platlib(wheel_purelib_and_platlib):
     }
     if platform.system() == 'Windows':
         expecting.add('plat{}'.format(EXT_SUFFIX.replace('pyd', 'dll.a')))
+    elif sys.platform == 'cygwin':
+        expecting.add('plat{}'.format(EXT_SUFFIX.replace('dll', 'dll.a')))
 
     assert wheel_contents(artifact) == expecting
 
@@ -216,6 +218,7 @@ def test_executable_bit(wheel_executable_bit):
     executable_files = {
         'executable_bit-1.0.0.data/purelib/executable_module.py',
         'executable_bit-1.0.0.data/scripts/example',
+        'executable_bit-1.0.0.data/scripts/example.exe',
         'executable_bit-1.0.0.data/scripts/example-script',
         'executable_bit-1.0.0.data/data/bin/example-script',
     }