Skip to content

Fix ABI tag detection logic to only check file basename #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jcrist wants to merge 1 commit into from
Closed

Fix ABI tag detection logic to only check file basename #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions mesonpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@ def platform_tag(self) -> str:
platform_ = '-'.join(parts)
return platform_.replace('-', '_').replace('.', '_')

def _calculate_file_abi_tag_heuristic_windows(self, filename: str) -> Optional[mesonpy._tags.Tag]:
def _calculate_file_abi_tag_heuristic_windows(self, basename: str) -> Optional[mesonpy._tags.Tag]:
"""Try to calculate the Windows tag from the Python extension file name."""
match = _WINDOWS_NATIVE_MODULE_REGEX.match(filename)
match = _WINDOWS_NATIVE_MODULE_REGEX.match(basename)
if not match:
return None
tag = match.group('tag')
Expand All @@ -339,7 +339,7 @@ def _calculate_file_abi_tag_heuristic_windows(self, filename: str) -> Optional[m
except ValueError:
return mesonpy._tags.InterpreterTag(tag)

def _calculate_file_abi_tag_heuristic_posix(self, filename: str) -> Optional[mesonpy._tags.Tag]:
def _calculate_file_abi_tag_heuristic_posix(self, basename: str) -> Optional[mesonpy._tags.Tag]:
"""Try to calculate the Posix tag from the Python extension file name."""
# sysconfig is not guaranted to export SHLIB_SUFFIX but let's be
# preventive and check its value to make sure it matches our expectations
Expand All @@ -358,7 +358,7 @@ def _calculate_file_abi_tag_heuristic_posix(self, filename: str) -> Optional[mes
'Please report this to https://github.com/mesonbuild/mesonpy/issues '
'and include the output of `python -m sysconfig`.'
)
match = _LINUX_NATIVE_MODULE_REGEX.match(filename)
match = _LINUX_NATIVE_MODULE_REGEX.match(basename)
if not match: # this file does not appear to be a native module
return None
tag = match.group('tag')
Expand All @@ -370,10 +370,11 @@ def _calculate_file_abi_tag_heuristic_posix(self, filename: str) -> Optional[mes

def _calculate_file_abi_tag_heuristic(self, filename: str) -> Optional[mesonpy._tags.Tag]:
"""Try to calculate the ABI tag from the Python extension file name."""
basename = os.path.basename(filename)
if os.name == 'nt':
return self._calculate_file_abi_tag_heuristic_windows(filename)
return self._calculate_file_abi_tag_heuristic_windows(basename)
# everything else *should* follow the POSIX way, at least to my knowledge
return self._calculate_file_abi_tag_heuristic_posix(filename)
return self._calculate_file_abi_tag_heuristic_posix(basename)

def _file_list_repr(self, files: Collection[str], prefix: str = '\t\t', max_count: int = 3) -> str:
if len(files) > max_count:
Expand Down