Skip to content

Commit

Permalink
Merge pull request #330 from davidhewitt/mypy-fixups
Browse files Browse the repository at this point in the history
fixup mypy issues
  • Loading branch information
davidhewitt committed Apr 26, 2023
2 parents f2224c8 + 0ca3eb4 commit 10f23a2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 6 additions & 4 deletions setuptools_rust/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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,)
Expand Down
6 changes: 2 additions & 4 deletions setuptools_rust/setuptools_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 10f23a2

Please sign in to comment.