Merge branch 'develop' into p/39379/p/add-lah-numbers

Author: kwankyu

.ci/write-dockerfile.sh

@@ -275,7 +275,7 @@ cat <<EOF
 FROM with-system-packages AS bootstrapped
 #:bootstrapping:
 RUN rm -rf /new /sage/.git
-$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
+$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap conftest.py configure_wrapper configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
 $ADD config/config.rpath /new/config/config.rpath
 $ADD src/doc/bootstrap /new/src/doc/bootstrap
 $ADD src/bin /new/src/bin
@@ -284,6 +284,7 @@ $ADD m4 /new/m4
 $ADD pkgs /new/pkgs
 $ADD build /new/build
 $ADD .upstream.d /new/.upstream.d
+$ADD tools /new/tools
 ADD .ci /.ci
 RUN if [ -d /sage ]; then \\
         echo "### Incremental build from \$(cat /sage/VERSION.txt)" && \\

.devcontainer/onCreate-conda.sh

@@ -6,8 +6,8 @@ conda config --env --add channels conda-forge
 conda config --env --set channel_priority strict
 conda update -y --all --override-channels -c conda-forge
 conda install mamba=1 -n base -y
-mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --file environment-3.11-linux.yml
+mamba env create -y --file environment-3.11-linux.yml || mamba env update --file environment-3.11-linux.yml
 conda init bash
 
 # Build sage
-conda run -n sage-dev pip install --no-build-isolation -v -v -e .
+conda run -n sage-dev pip install --no-build-isolation -v -v -e . --config-settings=build-dir="build/conda-cp311"

.devcontainer/onCreate-meson.sh

@@ -0,0 +1,30 @@
+#! /bin/sh
+
+SYSTEM=$(build/bin/sage-guess-package-system)
+
+if [ "$SYSTEM" = "fedora" ]; then
+    # Need to use --setopt=tsflags="" to avoid errors with gphelp
+    dnf5 install -y pari-gp --setopt=tsflags=""
+
+    # Mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
+    # by swapping the incorrectly installed OpenCL-ICD-Loader for the expected ocl-icd
+    dnf5 -y swap --repo='fedora' OpenCL-ICD-Loader ocl-icd
+fi
+
+eval $(build/bin/sage-print-system-package-command $SYSTEM "$@" update)
+eval $(build/bin/sage-print-system-package-command $SYSTEM --yes --ignore-missing install $(build/bin/sage-get-system-packages $SYSTEM $(build/bin/sage-package list :standard:)))
+
+# Disable build isolation following the advice of https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
+# Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
+uv venv
+uv pip install \
+    meson-python \
+    "cypari2 >=2.2.1" \
+    "cython >=3.0, != 3.0.3, != 3.1.0" \
+    "cython >=3.0, != 3.0.3" \
+    "gmpy2 ~=2.1.b999" \
+    memory_allocator \
+    "numpy >=1.25" \
+    jinja2 \
+    setuptool
+uv sync --frozen --inexact --no-build-isolation