Skip to content
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.

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

feat: SDist builds #1096

Merged
merged 9 commits into from Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 52 additions & 9 deletions cibuildwheel/__main__.py
Expand Up @@ -2,6 +2,8 @@
import os
import shutil
import sys
import tarfile
import tempfile
import textwrap
from pathlib import Path
from tempfile import mkdtemp
Expand All @@ -20,13 +22,12 @@
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="""
Expand Down Expand Up @@ -65,27 +66,33 @@ def main() -> None:

parser.add_argument(
"--output-dir",
type=Path,
help="Destination folder for the wheels. Default: wheelhouse.",
)

parser.add_argument(
"--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",
henryiii marked this conversation as resolved.
Show resolved Hide resolved
default=".",
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. Must be a subdirectory
of the working directory. When set to a directory, the working
directory is still considered the 'project' and is copied into the
Docker container on Linux. Default: the working directory. This can
also be a tar.gz file - if it is, then --config-file and
--output-dir are relative to the current directory, and other paths
are relative to the expanded SDist directory.
henryiii marked this conversation as resolved.
Show resolved Hide resolved
""",
)

Expand All @@ -109,6 +116,42 @@ 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 = Path(
args.output_dir
if args.output_dir is not None
else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")
henryiii marked this conversation as resolved.
Show resolved Hide resolved
).resolve()

# Standard builds if a directory or non-existent path is given
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoiding making a new directory if this ends with .tar.gz

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:
Expand Down
17 changes: 8 additions & 9 deletions cibuildwheel/options.py
Expand Up @@ -22,6 +22,7 @@
import tomllib
else:
import tomli as tomllib

from packaging.specifiers import SpecifierSet

from .architecture import Architecture
Expand All @@ -36,6 +37,7 @@
DependencyConstraints,
TestSelector,
cached_property,
format_safe,
resources_dir,
selector_matches,
strtobool,
Expand All @@ -46,9 +48,9 @@
class CommandLineArguments:
platform: Literal["auto", "linux", "macos", "windows"]
archs: Optional[str]
output_dir: Optional[str]
output_dir: Optional[Path]
henryiii marked this conversation as resolved.
Show resolved Hide resolved
config_file: str
package_dir: str
package_dir: Path
print_build_identifiers: bool
allow_empty: bool
prerelease_pythons: bool
Expand Down Expand Up @@ -344,7 +346,7 @@ def config_file_path(self) -> Optional[Path]:
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"
Expand All @@ -361,12 +363,9 @@ def package_requires_python_str(self) -> Optional[str]:
@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")
)
assert args.output_dir is not None, "Must be resolved"
henryiii marked this conversation as resolved.
Show resolved Hide resolved
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=" ")
Expand Down
19 changes: 17 additions & 2 deletions cibuildwheel/util.py
Expand Up @@ -19,13 +19,14 @@
Any,
ClassVar,
Dict,
Generator,
Iterable,
Iterator,
List,
NamedTuple,
Optional,
Sequence,
TextIO,
Union,
cast,
overload,
)
Expand Down Expand Up @@ -58,6 +59,7 @@
"selector_matches",
"strtobool",
"cached_property",
"chdir",
]

resources_dir: Final = Path(__file__).parent / "resources"
Expand Down Expand Up @@ -414,7 +416,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,
Expand Down Expand Up @@ -570,3 +572,16 @@ def virtualenv(
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)
2 changes: 1 addition & 1 deletion docs/cpp_standards.md
Expand Up @@ -14,7 +14,7 @@ The old `manylinux1` image (based on CentOS 5) contains a version of GCC and lib

OS X/macOS allows you to specify a so-called "deployment target" version that will ensure backwards compatibility with older versions of macOS. One way to do this is by setting the `MACOSX_DEPLOYMENT_TARGET` environment variable.

However, to enable modern C++ standards, the deploment target needs to be set high enough (since older OS X/macOS versions did not have the necessary modern C++ standard library).
However, to enable modern C++ standards, the deployment target needs to be set high enough (since older OS X/macOS versions did not have the necessary modern C++ standard library).

To get C++11 and C++14 support, `MACOSX_DEPLOYMENT_TARGET` needs to be set to (at least) `"10.9"`. By default, `cibuildwheel` already does this, building 64-bit-only wheels for macOS 10.9 and later.

Expand Down
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -13,6 +13,7 @@
"pytest>=6",
"pytest-timeout",
"pytest-xdist",
"build",
],
"bin": [
"click",
Expand Down