Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert type names

Browse Source
This commit is contained in:
Steve Dower
2022-08-01 20:29:51 +01:00
parent 4c73245a7f
commit c3dcb07fb6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/windows.py
+5 -6
View File
@@ -38,7 +38,7 @@ from .util import (
) )
def get_nuget_args(version: str, arch: str, output_directory: Path) -> List[str]: def get_nuget_args(version: str, arch: str, output_directory: Path) -> list[str]:
package_name = { package_name = {
"32": "pythonx86", "32": "pythonx86",
"64": "python", "64": "python",
@@ -131,7 +131,7 @@ def install_pypy(tmp: Path, arch: str, url: str) -> Path:
def setup_setuptools_cross_compile( def setup_setuptools_cross_compile(
python_configuration: PythonConfiguration, python_configuration: PythonConfiguration,
python_libs_base: Path, python_libs_base: Path,
env: Dict[str, str], env: dict[str, str],
) -> None: ) -> None:
# We write to distutils_cfg for distutils-based builds because we know we # We write to distutils_cfg for distutils-based builds because we know we
# currently don't have one (unless it's our own from a previous build) # currently don't have one (unless it's our own from a previous build)
@@ -183,7 +183,7 @@ def setup_setuptools_cross_compile(
def setup_rust_cross_compile( def setup_rust_cross_compile(
python_configuration: PythonConfiguration, python_configuration: PythonConfiguration,
python_libs_base: Path, python_libs_base: Path,
env: Dict[str, str], env: dict[str, str],
) -> None: ) -> None:
# Assume that MSVC will be used, because we already know that we are # Assume that MSVC will be used, because we already know that we are
# cross-compiling. MinGW users can set CARGO_BUILD_TARGET themselves # cross-compiling. MinGW users can set CARGO_BUILD_TARGET themselves
@@ -200,12 +200,11 @@ def setup_rust_cross_compile(
log.notice("Not overriding CARGO_BUILD_TARGET as it has already been set") log.notice("Not overriding CARGO_BUILD_TARGET as it has already been set")
# No message if it was set to what we were planning to set it to # No message if it was set to what we were planning to set it to
elif cargo_target: elif cargo_target:
log.notice("Setting CARGO_BUILD_TARGET=%s for cross-compilation", cargo_target) log.notice(f"Setting CARGO_BUILD_TARGET={cargo_target} for cross-compilation")
env["CARGO_BUILD_TARGET"] = cargo_target env["CARGO_BUILD_TARGET"] = cargo_target
else: else:
log.warning( log.warning(
"Unable to configure Rust cross-compilation for architecture '%s'", f"Unable to configure Rust cross-compilation for architecture {python_configuration.arch}"
python_configuration.arch,
) )