Skip to content

Commit 8f57adb

Browse files
author
Matthias Koeppe
committed
tox.ini: When setting --with-system-python3=force, always provision the python3 depcheck dependencies
1 parent 6429f21 commit 8f57adb

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

tox.ini

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,11 @@ setenv =
529529
# - python
530530
#
531531
# Setting "--with-system-python3=yes" explicitly in case we change the configure default
532-
# to "--with-system-python3=force" as originally proposed in #32060
532+
# to "--with-system-python3=force" as originally proposed in #32060.
533+
#
534+
# For all factors that set "--with-system-python3=force",
535+
# we add "_bootstrap liblzma bzip2 libffi libpng zlib" to EXTRA_SAGE_PACKAGES_5
536+
# so that the configured python3 can be accepted by configure.
533537
PYTHON_MAJOR=3
534538
PYTHON_MINOR=10
535539
python3.9: PYTHON_MINOR=9
@@ -540,16 +544,20 @@ setenv =
540544
python3_spkg: CONFIG_CONFIGURE_ARGS_1=--without-system-python3
541545
python3.9,python3.10,python3.11,python3.12: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}
542546
python3.9,python3.10,python3.11,python3.12: EXTRA_SAGE_PACKAGES_5=_python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} _bootstrap liblzma bzip2 libffi libpng zlib
547+
# As of 2023-9, Xcode 15.0.0, this is Python 3.9.6.
543548
macos-python3_xcode: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/usr/bin/python3
544-
macos-{python3_xcode,nohomebrew}-{python3.8}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
549+
macos-python3_xcode: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
550+
macos-{python3_xcode,nohomebrew}-{python3.9}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
545551
# Homebrew keg installs
546-
homebrew-{python3.9,python3.10,python3.11,python3.12}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
552+
homebrew-{python3.9,python3.10,python3.11,python3.12}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
547553
# Installers from https://www.python.org/downloads/macos/ (must manually download and install)
548554
macos-python3_pythonorg: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Frameworks/Python.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
555+
macos-python3_pythonorg: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
549556
# https://github.com/pypa/manylinux
550557
manylinux-standard: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp{env:PYTHON_MAJOR}{env:PYTHON_MINOR}-cp{env:PYTHON_MAJOR}{env:PYTHON_MINOR}/bin/python3
551558
manylinux-{python3.9,python3.10,python3.11,python3.12}: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng
552559
conda: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python3
560+
conda: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
553561
#
554562
# - toolchain
555563
#

0 commit comments

Comments
 (0)