tox.ini: Updates for macos and manylinux from #31396

sagemath · Jan 12, 2022 · 1fcdc91 · 1fcdc91
1 parent 49236dd
commit 1fcdc91
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/tox.ini b/tox.ini
@@ -453,7 +453,7 @@ setenv =
     # We use liblzma from the macOS system - which is available but its headers are not (neither is the xz executable).
     # So we use /usr/local/opt/xz/{bin,include} (but not lib!).
     # This ensures that /usr/bin/python3 is accepted by configure - this is needed until #30948 is done.
-    local-macos-nohomebrew: PATH={env:HOMEBREW}/opt/xz/bin:{env:HOMEBREW}/opt/gpatch/bin:/usr/bin:/bin:/usr/sbin:/sbin
+    local-macos-nohomebrew: PATH={env:HOMEBREW}/opt/xz/bin:{env:HOMEBREW}/opt/gpatch/bin:{env:HOMEBREW}/opt/cmake/bin:/usr/bin:/bin:/usr/sbin:/sbin
     local-macos-nohomebrew: CPATH={env:HOMEBREW}/opt/xz/include
     local-homebrew:   PATH={env:HOMEBREW}/bin:/usr/bin:/bin:/usr/sbin:/sbin
     local-{homebrew-nokegonly,nohomebrew}: BOOTSTRAP=ACLOCAL_PATH="$HOMEBREW/opt/gettext/share/aclocal:$ACLOCAL_PATH" PATH="$HOMEBREW/opt/gettext/bin/:$HOMEBREW/bin:$PATH" ./bootstrap
@@ -499,6 +499,7 @@ setenv =
     # 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.7:      CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp37-cp37m/bin/python3
+    manylinux-{python3.7,python3.8,python3.9,python3.10,python3.11}:  EXTRA_SAGE_PACKAGES=_bootstrap xz bzip2 libffi libpng
     conda:                    CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python3
     #
     #  - toolchain
@@ -511,7 +512,7 @@ setenv =
     llvm:                       EXTRA_SAGE_PACKAGES_2=llvm
     # LLVM is keg-only
     homebrew-llvm:            CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC={env:HOMEBREW}/opt/llvm/bin/clang CXX={env:HOMEBREW}/opt/llvm/bin/clang++
-    macos-nohomebrew:         CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC="$CONFIGURED_CC" CXX="$CONFIGURED_CXX" --with-mp=gmp --without-system-mpfr --without-system-readline --without-system-boost --without-system-boost_cropped
+    macos-nohomebrew:         CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC="$CONFIGURED_CC" CXX="$CONFIGURED_CXX" --without-system-gmp --without-system-mpfr --without-system-readline --without-system-boost_cropped
     macos-nohomebrew:           CONFIGURED_CXX=g++ -isysroot {env:MACOS_SDK}
     macos-nohomebrew:           CONFIGURED_CC=gcc -isysroot {env:MACOS_SDK}
     # Prevent /usr/local to leak in:
@@ -528,6 +529,10 @@ setenv =
     macos-10.15:                    MACOSX_DEPLOYMENT_TARGET=10.15
     macos-11.1:                   MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
     macos-11.1:                     MACOSX_DEPLOYMENT_TARGET=11.1
+    macos-11.3:                   MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk
+    macos-11.3:                     MACOSX_DEPLOYMENT_TARGET=11.3
+    macos-12.1:                   MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk
+    macos-12.1:                     MACOSX_DEPLOYMENT_TARGET=12.1
     #
     # Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment
     #
@@ -621,7 +626,7 @@ commands =
     local:             {env:SETENV_CONFIGURE} && \
     local:             case "{env:SKIP_CONFIGURE:}" in 1|y*|Y*);; *) ./configure --prefix={env:PREFIX:{envdir}/local} {env:CONFIGURE_ARGS} ;; esac && \
     local:             case "{posargs:}" in \
-    local:                 bash)    bash -i; exit ;; \
+    local:                 bash)    PS1="(tox -e {envname}) \w\$ " bash -i; exit ;; \
     local:                 config*) ;; \
     local:                 *)       make -k V=0 base-toolchain ;; \
     local:             esac && \