diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py index 8f0afcfe..9a039ca3 100644 --- a/setuptools_rust/build.py +++ b/setuptools_rust/build.py @@ -20,6 +20,7 @@ from typing import Dict, Iterable, List, NamedTuple, Optional, Set, Tuple, cast import pkg_resources +from semantic_version import Version from setuptools.command.build import build as CommandBuild # type: ignore[import] from setuptools.command.build_ext import build_ext as CommandBuildExt from setuptools.command.build_ext import get_abi3_suffix @@ -31,10 +32,9 @@ from .rustc_info import ( get_rust_host, get_rust_target_list, - get_rustc_cfgs, get_rust_version, + get_rustc_cfgs, ) -from semantic_version import Version def _check_cargo_supports_crate_type_option() -> bool: @@ -108,8 +108,10 @@ def finalize_options(self) -> None: def get_data_dir(self) -> str: components = ( - pkg_resources.safe_name(self.distribution.get_name()).replace("-", "_"), # type: ignore[attr-defined] - pkg_resources.safe_version(self.distribution.get_version()).replace("-", "_"), # type: ignore[attr-defined] + pkg_resources.safe_name(self.distribution.get_name()).replace("-", "_"), + pkg_resources.safe_version(self.distribution.get_version()).replace( + "-", "_" + ), ) if self.build_number: components += (self.build_number,) diff --git a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py index 8ce281e1..ab51d165 100644 --- a/setuptools_rust/setuptools_ext.py +++ b/setuptools_rust/setuptools_ext.py @@ -275,10 +275,8 @@ def rust_extensions( has_rust_extensions = len(value) > 0 # Monkey patch has_ext_modules to include Rust extensions. - # - # has_ext_modules is missing from Distribution typing. - orig_has_ext_modules = dist.has_ext_modules # type: ignore[attr-defined] - dist.has_ext_modules = lambda: (orig_has_ext_modules() or has_rust_extensions) # type: ignore[attr-defined] + orig_has_ext_modules = dist.has_ext_modules + dist.has_ext_modules = lambda: (orig_has_ext_modules() or has_rust_extensions) # type: ignore[method-assign] if has_rust_extensions: add_rust_extension(dist)