Merge remote-tracking branch 'origin/main' into abi3

cibuildwheel/__main__.py

@@ -2,6 +2,8 @@ import argparse
 import os
 import shutil
 import sys
+import tarfile
+import tempfile
 import textwrap
 from pathlib import Path
 from tempfile import mkdtemp
@@ -20,13 +22,12 @@ from cibuildwheel.util import (
     CIBW_CACHE_PATH,
     BuildSelector,
     Unbuffered,
+    chdir,
     detect_ci_provider,
 )
 
 
 def main() -> None:
-    platform: PlatformName
-
     parser = argparse.ArgumentParser(
         description="Build wheels for all the platforms.",
         epilog="""
@@ -65,6 +66,8 @@ def main() -> None:
 
     parser.add_argument(
         "--output-dir",
+        type=Path,
+        default=Path(os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")),
         help="Destination folder for the wheels. Default: wheelhouse.",
     )
 
@@ -72,20 +75,26 @@ def main() -> None:
         "--config-file",
         default="",
         help="""
-            TOML config file. Default: "", meaning {package}/pyproject.toml,
-            if it exists.
+            TOML config file. Default: "", meaning {package}/pyproject.toml, if
+            it exists. To refer to a project inside your project, use {package};
+            this matters if you build from an SDist.
         """,
     )
 
     parser.add_argument(
         "package_dir",
-        default=".",
+        metavar="PACKAGE",
+        default=Path("."),
+        type=Path,
         nargs="?",
         help="""
-            Path to the package that you want wheels for. Must be a subdirectory of
-            the working directory. When set, the working directory is still
-            considered the 'project' and is copied into the Docker container on
-            Linux. Default: the working directory.
+            Path to the package that you want wheels for. Default: the working
+            directory. Can be a directory inside the working directory, or an
+            sdist. When set to a directory, the working directory is still
+            considered the 'project' and is copied into the Docker container
+            on Linux.  When set to a tar.gz sdist file, --config-file
+            and --output-dir are relative to the current directory, and other
+            paths are relative to the expanded SDist directory.
         """,
     )
 
@@ -109,6 +118,38 @@ def main() -> None:
 
     args = parser.parse_args(namespace=CommandLineArguments())
 
+    args.package_dir = args.package_dir.resolve()
+
+    # This are always relative to the base directory, even in SDist builds
+    args.output_dir = args.output_dir.resolve()
+
+    # Standard builds if a directory or non-existent path is given
+    if not args.package_dir.is_file() and not args.package_dir.name.endswith("tar.gz"):
+        build_in_directory(args)
+        return
+
+    # Tarfile builds require extraction and changing the directory
+    with tempfile.TemporaryDirectory(prefix="cibw-sdist-") as temp_dir_str:
+        temp_dir = Path(temp_dir_str)
+        with tarfile.open(args.package_dir) as tar:
+            tar.extractall(path=temp_dir)
+
+        # The extract directory is now the project dir
+        try:
+            (project_dir,) = temp_dir.iterdir()
+        except ValueError:
+            raise SystemExit("invalid sdist: didn't contain a single dir") from None
+
+        # This is now the new package dir
+        args.package_dir = project_dir.resolve()
+
+        with chdir(temp_dir):
+            build_in_directory(args)
+
+
+def build_in_directory(args: CommandLineArguments) -> None:
+    platform: PlatformName
+
     if args.platform != "auto":
         platform = args.platform
     else:

cibuildwheel/options.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from typing import (
     Any,
     Dict,
-    Iterator,
+    Generator,
     List,
     Mapping,
     NamedTuple,
@@ -22,6 +22,7 @@ if sys.version_info >= (3, 11):
     import tomllib
 else:
     import tomli as tomllib
+
 from packaging.specifiers import SpecifierSet
 
 from .architecture import Architecture
@@ -36,6 +37,7 @@ from .util import (
     DependencyConstraints,
     TestSelector,
     cached_property,
+    format_safe,
     resources_dir,
     selector_matches,
     strtobool,
@@ -46,9 +48,9 @@ from .util import (
 class CommandLineArguments:
     platform: Literal["auto", "linux", "macos", "windows"]
     archs: Optional[str]
-    output_dir: Optional[str]
+    output_dir: Path
     config_file: str
-    package_dir: str
+    package_dir: Path
     print_build_identifiers: bool
     allow_empty: bool
     prerelease_pythons: bool
@@ -263,7 +265,7 @@ class OptionsReader:
         ]
 
     @contextmanager
-    def identifier(self, identifier: Optional[str]) -> Iterator[None]:
+    def identifier(self, identifier: Optional[str]) -> Generator[None, None, None]:
         self.current_identifier = identifier
         try:
             yield
@@ -344,7 +346,7 @@ class Options:
         args = self.command_line_arguments
 
         if args.config_file:
-            return Path(args.config_file.format(package=args.package_dir))
+            return Path(format_safe(args.config_file, package=args.package_dir))
 
         # return pyproject.toml, if it's available
         pyproject_toml_path = Path(args.package_dir) / "pyproject.toml"
@@ -361,12 +363,8 @@ class Options:
     @property
     def globals(self) -> GlobalOptions:
         args = self.command_line_arguments
-        package_dir = Path(args.package_dir)
-        output_dir = Path(
-            args.output_dir
-            if args.output_dir is not None
-            else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")
-        )
+        package_dir = args.package_dir
+        output_dir = args.output_dir
 
         build_config = self.reader.get("build", env_plat=False, sep=" ") or "*"
         skip_config = self.reader.get("skip", env_plat=False, sep=" ")

cibuildwheel/util.py

@@ -19,14 +19,15 @@ from typing import (
     Any,
     ClassVar,
     Dict,
+    Generator,
     Iterable,
-    Iterator,
     List,
     NamedTuple,
     Optional,
     Sequence,
     TextIO,
     TypeVar,
+    Union,
     cast,
     overload,
 )
@@ -61,6 +62,7 @@ __all__ = [
     "selector_matches",
     "strtobool",
     "cached_property",
+    "chdir",
 ]
 
 resources_dir: Final = Path(__file__).parent / "resources"
@@ -417,7 +419,7 @@ def unwrap(text: str) -> str:
 
 
 @contextlib.contextmanager
-def print_new_wheels(msg: str, output_dir: Path) -> Iterator[None]:
+def print_new_wheels(msg: str, output_dir: Path) -> Generator[None, None, None]:
     """
     Prints the new items in a directory upon exiting. The message to display
     can include {n} for number of wheels, {s} for total number of seconds,
@@ -609,3 +611,16 @@ if sys.version_info >= (3, 8):
     from functools import cached_property
 else:
     from .functools_cached_property_38 import cached_property
+
+
+# Can be replaced by contextlib.chdir in Python 3.11
+@contextlib.contextmanager
+def chdir(new_path: Union[Path, str]) -> Generator[None, None, None]:
+    """Non thread-safe context manager to change the current working directory."""
+
+    cwd = os.getcwd()
+    try:
+        os.chdir(new_path)
+        yield
+    finally:
+        os.chdir(cwd)