Skip to content

Replace uses of setup.py bdist_wheel and direct uses of python3 -m build #38201

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jul 4, 2024
Merged

Replace uses of setup.py bdist_wheel and direct uses of python3 -m build #38201

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb5f1b9
build/bin/sage-dist-helpers (sdh_build_wheel): Split out from sdh_pip…
mkoeppe May 10, 2024
03d0a01
build/bin/sage-dist-helpers (sdh_build_wheel): New option --sdist-the…
mkoeppe Jun 12, 2024
acf1083
build/pkgs/sagemath_objects/spkg-install.in: Use sdh_build_and_store_…
mkoeppe Jun 12, 2024
8a6e2b0
build/pkgs/{sage_conf,sage_docbuild,sage_setup,sage_sws2rst}/spkg-ins…
mkoeppe Jun 12, 2024
0b2033c
build/pkgs/sagelib/spkg-install.in: Use sdh_build_and_store_wheel
mkoeppe Jun 12, 2024
0878cc2
build/bin/sage-dist-helpers (sdh_setup_bdist_wheel): Remove
mkoeppe Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build/bin/sage-dist-helpers (sdh_build_wheel): New option --sdist-the… 
…n-wheel
  • Loading branch information
Matthias Koeppe committed Jun 22, 2024
commit 03d0a0156d2ebcb7c1c76ff8bd98bdb7d58dbc91
13 changes: 9 additions & 4 deletions build/bin/sage-dist-helpers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ sdh_build_wheel() {
build_options=""
# pip has --no-build-isolation but no flag that turns the default back on...
build_isolation_option=""
# build has --wheel but no flag that turns the default (build sdist and then wheel) back on
dist_option="--wheel"
export PIP_FIND_LINKS="$SAGE_SPKG_WHEELS"
unset PIP_NO_BINARY
while [ $# -gt 0 ]; do
Expand All @@ -242,6 +244,9 @@ sdh_build_wheel() {
export PIP_NO_BINARY=:all:
build_isolation_option="--no-isolation --skip-dependency-check"
;;
--sdist-then-wheel)
dist_option=""
;;
--no-deps)
install_options="$install_options $1"
;;
Expand All @@ -257,20 +262,20 @@ sdh_build_wheel() {
esac
shift
done
if python3 -m build --wheel --outdir=dist $build_isolation_option $build_options "$@"; then
if python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options "$@"; then
: # successful
else
case $build_isolation_option in
*--no-isolation*)
sdh_die "Error building a wheel for $PKG_NAME"
;;
*)
echo >&2 "Warning: building with \"python3 -m build --wheel --outdir=dist $build_isolation_option $build_options $@\" failed."
echo >&2 "Warning: building with \"python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options $@\" failed."
unset PIP_FIND_LINKS
export PIP_NO_BINARY=:all:
build_isolation_option="--no-isolation --skip-dependency-check"
echo >&2 "Retrying with \"python3 -m build --wheel --outdir=dist $build_isolation_option $build_options $@\"."
if python3 -m build --wheel --outdir=dist $build_isolation_option $build_options "$@"; then
echo >&2 "Retrying with \"python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options $@\"."
if python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options "$@"; then
echo >&2 "Warning: Wheel building needed to use \"$build_isolation_option\" to succeed. This means that a dependencies file in build/pkgs/ needs to be updated. Please report this to [email protected], including the build log of this package."
else
sdh_die "Error building a wheel for $PKG_NAME"
Expand Down