Skip to content

CI: Fix the multi-stage build in ci-linux.yml, fix conda/centos/archlinux system packages #36358

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 10 commits into from
Oct 8, 2023
Merged

CI: Fix the multi-stage build in ci-linux.yml, fix conda/centos/archlinux system packages #36358

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6429f21
.github/workflows/docker.yml, tox.ini: Use the commit sha before merg…
mkoeppe Sep 28, 2023
8f57adb
tox.ini: When setting --with-system-python3=force, always provision t…
mkoeppe Sep 28, 2023
2356efa
build/pkgs/_python3.*/distros/fedora.txt: Packages now include a dot …
mkoeppe Sep 28, 2023
6c3d558
build/bin/write-dockerfile.sh, .github/workflows/scan-logs.sh: Use mo…
mkoeppe Sep 28, 2023
d07403d
Handle almalinux-8 like centos-8
mkoeppe Sep 29, 2023
a20d61f
tox.ini (archlinux): Use IGNORE_MISSING_SYSTEM_PACKAGES=yes
mkoeppe Sep 29, 2023
3f8d4cb
build/pkgs/freetype/distros/debian.txt: change to fix debian-sid
mkoeppe Sep 29, 2023
f83da2e
tox.ini (debian-buster): Use IGNORE_MISSING_SYSTEM_PACKAGES=yes
mkoeppe Sep 30, 2023
0366627
build/pkgs/{pkgconf,_bootstrap}/distros/arch.txt: Update
mkoeppe Sep 30, 2023
def59ae
tox.ini (ubuntu-lunar,mantic): Remove IGNORE_MISSING_SYSTEM_PACKAGES;…
mkoeppe Sep 30, 2023
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
tox.ini: When setting --with-system-python3=force, always provision t… 
…he python3 depcheck dependencies
  • Loading branch information
Matthias Koeppe committed Sep 30, 2023
commit 8f57adb85390a48158b835503655e29e92f68c68
14 changes: 11 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,11 @@ setenv =
# - python
#
# Setting "--with-system-python3=yes" explicitly in case we change the configure default
# to "--with-system-python3=force" as originally proposed in #32060
# to "--with-system-python3=force" as originally proposed in #32060.
#
# For all factors that set "--with-system-python3=force",
# we add "_bootstrap liblzma bzip2 libffi libpng zlib" to EXTRA_SAGE_PACKAGES_5
# so that the configured python3 can be accepted by configure.
PYTHON_MAJOR=3
PYTHON_MINOR=10
python3.9: PYTHON_MINOR=9
Expand All @@ -540,16 +544,20 @@ setenv =
python3_spkg: CONFIG_CONFIGURE_ARGS_1=--without-system-python3
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}
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
# As of 2023-9, Xcode 15.0.0, this is Python 3.9.6.
macos-python3_xcode: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/usr/bin/python3
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
macos-python3_xcode: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
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
# Homebrew keg installs
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
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
# Installers from https://www.python.org/downloads/macos/ (must manually download and install)
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
macos-python3_pythonorg: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
# https://github.com/pypa/manylinux
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
manylinux-{python3.9,python3.10,python3.11,python3.12}: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng
conda: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python3
conda: EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
#
# - toolchain
#
Expand Down