vincentmacri · vincentmacri · Jun 5, 2025 · Jun 5, 2025 · Jun 6, 2025 · Jan 2, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           - archlinux
           #- ubuntu:22.04 - gap is outdated there (only 4.11)
           - ubuntu:24.04
-          - ubuntu:25.04
+          - ubuntu:26.04
     container:
       image: ${{ matrix.container }}
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,12 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap _prereq)
       - name: Configure with --enable-download-from-upstream-url
         run: |
-          make configure
+          # Run "bootstrap -s" so that the configure tarball
+          # (configure-$(git rev-parse HEAD).tar.gz) is generated and saved
+          # locally to upstream/. Otherwise "make dist" below tries to
+          # download it from the Sage mirrors / GitHub release assets, which
+          # fails for unreleased commits (e.g. on workflow_dispatch / PR runs).
+          ./bootstrap -s
           ./configure
       - name: make dist (--enable-download-from-upstream-url)
         id: make_dist

diff --git a/CITATION.cff b/CITATION.cff
@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.10.beta0
+version: 10.10.beta1
 doi: 10.5281/zenodo.8042260
-date-released: 2026-05-09
+date-released: 2026-05-18
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-10.10.beta0
+10.10.beta1
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=99e31b3dfe356d5aaae449a774230b2fd532b305
-sha256=393e873913e58278ac593bcf66e383048260138a637684f618f86a00a23efbbb
+sha1=eda61dd645333ea58511a3e9ca807c0742ad541f
+sha256=9103a554db8222d8dbbf9ac8ba192cd640efd8603af628a20a3a0c0e58873339
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-4d326550247377bf4b9226f5d21273dbb9e1026e
+722ddb85e9475978d0b1ef490d6780091279c753
diff --git a/build/pkgs/dot2tex/SPKG.rst b/build/pkgs/dot2tex/SPKG.rst
@@ -9,7 +9,7 @@ Graphviz a more LaTeX friendly look and feel. This is accomplished by
 converting xdot output from Graphviz to a series of PSTricks or PGF/TikZ
 commands.
 
-See https://github.com/kjellmf/dot2tex/
+See https://github.com/sagemath/dot2tex/
 
 License
 -------
@@ -21,6 +21,7 @@ Upstream Contact
 ----------------
 
 -  Kjell Magne Fauske, km@fauskes.net
+-  SageMath developers
 
 Dependencies
 ------------
@@ -37,18 +38,9 @@ Self-tests dependencies:
 -  texlive-pictures
 -  texlive-pstricks
 
-Patches
--------
-
--  remove_test_semicolon.patch:
-
-   Remove the failing semicolon test for the open dot2tex
-   issue #5 - https://github.com/kjellmf/dot2tex/issues/5
-
-
 Special Update/Build Instructions
 ---------------------------------
 
 Make sure corresponding optional doctests still pass:
 
-   sage -t --long --optional=dot2tex,graphviz,sage src/
+   sage -t --long --optional=dot2tex,graphviz,sage --all
diff --git a/build/pkgs/dot2tex/checksums.ini b/build/pkgs/dot2tex/checksums.ini
diff --git a/build/pkgs/dot2tex/package-version.txt b/build/pkgs/dot2tex/package-version.txt
diff --git a/build/pkgs/dot2tex/patches/remove_test_semicolon.patch b/build/pkgs/dot2tex/patches/remove_test_semicolon.patch
diff --git a/build/pkgs/dot2tex/requirements.txt b/build/pkgs/dot2tex/requirements.txt
@@ -0,0 +1 @@
+dot2tex >=2.12.0
diff --git a/build/pkgs/dot2tex/spkg-install.in b/build/pkgs/dot2tex/spkg-install.in
diff --git a/build/pkgs/dot2tex/version_requirements.txt b/build/pkgs/dot2tex/version_requirements.txt
diff --git a/build/pkgs/highs/SPKG.rst b/build/pkgs/highs/SPKG.rst
@@ -0,0 +1,45 @@
+highs: Linear optimization solver
+=================================
+
+Description
+-----------
+
+HiGHS is a high performance serial and parallel solver for large scale sparse
+linear optimization problems of the form:
+
+.. MATH::
+
+    \min \, c^T x \quad \text{subject to} \quad L \leq Ax \leq U, \; l \leq x \leq u
+
+where :math:`c`, :math:`x`, :math:`l`, :math:`u` are vectors,
+:math:`L`, :math:`U` are constraint bound vectors, and :math:`A` is a matrix.
+
+HiGHS has implementations of the dual revised simplex method, primal and dual
+revised simplex solvers, an interior point solver, and a MIP solver.
+
+This package builds the HiGHS C/C++ library with C API headers for use in
+Sage's numerical backends.
+
+License
+-------
+
+- MIT License
+
+Upstream Contact
+----------------
+
+- https://github.com/ERGO-Code/HiGHS
+- https://www.highs.dev
+- Email: hello@highs.dev
+
+Dependencies
+------------
+
+- CMake (build dependency)
+
+Special Update/Build Instructions
+----------------------------------
+
+The library is built using CMake and provides the C API interface
+(highs_c_api.h) for integration with Sage's backend system.
+
diff --git a/build/pkgs/highs/checksums.ini b/build/pkgs/highs/checksums.ini
@@ -0,0 +1,4 @@
+tarball=highs-VERSION.tar.gz
+sha1=fbde91befa72d303149fa7be32dcd44b73e406eb
+sha256=05931e8dd8c8cac514da8297003c31a206a0004d542b7da500810b85c87c20b9
+upstream_url=https://github.com/ERGO-Code/HiGHS/archive/refs/tags/vVERSION.tar.gz
diff --git a/build/pkgs/dot2tex/dependencies → build/pkgs/highs/dependencies b/build/pkgs/dot2tex/dependencies → build/pkgs/highs/dependencies
@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) pyparsing $(PYTHON)
+cmake
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/highs/distros/arch.txt b/build/pkgs/highs/distros/arch.txt
@@ -0,0 +1 @@
+highs
diff --git a/build/pkgs/highs/distros/conda.txt b/build/pkgs/highs/distros/conda.txt
@@ -0,0 +1 @@
+highs
diff --git a/build/pkgs/highs/distros/debian.txt b/build/pkgs/highs/distros/debian.txt
@@ -0,0 +1,2 @@
+libhighs-dev
+highs
diff --git a/build/pkgs/highs/distros/fedora.txt b/build/pkgs/highs/distros/fedora.txt
@@ -0,0 +1,2 @@
+coin-or-HiGHS
+coin-or-HiGHS-devel
diff --git a/build/pkgs/highs/distros/freebsd.txt b/build/pkgs/highs/distros/freebsd.txt
@@ -0,0 +1 @@
+math/highs
diff --git a/build/pkgs/highs/distros/gentoo.txt b/build/pkgs/highs/distros/gentoo.txt
@@ -0,0 +1 @@
+sci-mathematics/highs
diff --git a/build/pkgs/highs/distros/homebrew.txt b/build/pkgs/highs/distros/homebrew.txt
@@ -0,0 +1 @@
+highs
diff --git a/build/pkgs/highs/distros/macports.txt b/build/pkgs/highs/distros/macports.txt
@@ -0,0 +1 @@
+HiGHS
diff --git a/build/pkgs/highs/distros/nix.txt b/build/pkgs/highs/distros/nix.txt
@@ -0,0 +1 @@
+highs
diff --git a/build/pkgs/highs/distros/opensuse.txt b/build/pkgs/highs/distros/opensuse.txt
@@ -0,0 +1,2 @@
+HiGHS
+HiGHS-devel
diff --git a/build/pkgs/highs/distros/repology.txt b/build/pkgs/highs/distros/repology.txt
@@ -0,0 +1 @@
+highs
diff --git a/build/pkgs/highs/math b/build/pkgs/highs/math
diff --git a/build/pkgs/highs/package-version.txt b/build/pkgs/highs/package-version.txt
@@ -0,0 +1 @@
+1.14.0
diff --git a/build/pkgs/highs/spkg-configure.m4 b/build/pkgs/highs/spkg-configure.m4
@@ -0,0 +1,37 @@
+SAGE_SPKG_CONFIGURE([highs], [
+    m4_pushdef([SAGE_HIGHS_MINVER],["1.12.0"])
+    dnl First check if HiGHS is available via pkg-config
+    PKG_CHECK_MODULES([HIGHS], [highs >= $SAGE_HIGHS_MINVER], [
+        dnl pkg-config found HiGHS, now verify the headers are actually usable
+        dnl Some distro packages (e.g., Debian) have broken pkg-config files
+        dnl with incorrect include paths from the build directory
+        save_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $HIGHS_CFLAGS"
+        AC_MSG_CHECKING([whether HiGHS headers are usable])
+        AC_COMPILE_IFELSE([
+            AC_LANG_PROGRAM([[
+                #include <interfaces/highs_c_api.h>
+                typedef char sage_highsint_must_match_int[
+                    (sizeof(HighsInt) == sizeof(int)) ? 1 : -1
+                ];
+            ]], [[
+                Highs_create();
+            ]])
+        ], [
+            AC_MSG_RESULT([yes])
+        ], [
+            AC_MSG_RESULT([no])
+            AC_MSG_NOTICE([HiGHS pkg-config found but headers not usable.])
+            AC_MSG_NOTICE([This may indicate a broken system package with incorrect include paths.])
+            AC_MSG_NOTICE([It may also indicate that HiGHS was built with 64-bit HighsInt,])
+            AC_MSG_NOTICE([which is not compatible with Sage's current HiGHS Cython wrapper.])
+            AC_MSG_NOTICE([Will build HiGHS from source.])
+            sage_spkg_install_highs=yes
+        ])
+        CPPFLAGS="$save_CPPFLAGS"
+    ], [
+        dnl pkg-config did not find HiGHS
+        sage_spkg_install_highs=yes
+    ])
+    m4_popdef([SAGE_HIGHS_MINVER])
+])
diff --git a/build/pkgs/highs/spkg-install.in b/build/pkgs/highs/spkg-install.in
@@ -0,0 +1,14 @@
+cd src
+mkdir -p build
+cd build
+sdh_cmake -DBUILD_SHARED_LIBS=ON \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DBUILD_TESTING=OFF \
+          -DBUILD_CXX=ON \
+          -DZLIB=ON \
+          -DCMAKE_VERBOSE_MAKEFILE=ON \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          ..
+sdh_make
+sdh_make_install
+
diff --git a/build/pkgs/highs/type b/build/pkgs/highs/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/build/pkgs/sage_docbuild/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sage-docbuild ~= 10.9
+sage-docbuild ~= 10.10b0
diff --git a/build/pkgs/sage_setup/version_requirements.txt b/build/pkgs/sage_setup/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sage-setup ~= 10.9
+sage-setup ~= 10.10b0
diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap givaro glpk gmpy2 gsl iml jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie maxima memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) $(PYTHON) pythran
+FORCE $(SCRIPTS) $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap givaro glpk gmpy2 gsl highs iml jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie maxima memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) $(PYTHON) pythran
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/sagelib/spkg-install.in b/build/pkgs/sagelib/spkg-install.in
@@ -55,7 +55,8 @@ if [ "$SAGE_EDITABLE" = yes ]; then
         --config-settings=build-dir="build/sage-distro" \
         --config-settings=setup-args="--native-file=$SAGE_PKGS/../platform/meson/sage-configure-native-file.ini" \
         --config-settings=setup-args="-DSAGE_LOCAL=$SAGE_LOCAL" \
-        --config-settings=setup-args="-Dbuild-docs=$SAGE_BUILD_DOCS"
+        --config-settings=setup-args="-Dbuild-docs=$SAGE_BUILD_DOCS" \
+        --config-settings=setup-args="-Ddefer_feature_checks=true"
 
     if [ "$SAGE_WHEELS" = yes ]; then
         # Additionally build a wheel (for use in other venvs)
@@ -73,7 +74,8 @@ else
     # Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd
     sdh_pip_install --no-build-isolation . --config-setting=build-dir="build/sage-distro" \
         --config-setting=setup-args="-DSAGE_LOCAL=$SAGE_LOCAL" \
-        --config-setting=setup-args="-Dbuild-docs=$SAGE_BUILD_DOCS"
+        --config-setting=setup-args="-Dbuild-docs=$SAGE_BUILD_DOCS" \
+        --config-settings=setup-args="-Ddefer_feature_checks=true"
 fi
 
 # Remove (potentially invalid) star import caches.

diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/build/pkgs/sagemath_categories/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-categories ~= 10.9
+sagemath-categories ~= 10.10b0
diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/build/pkgs/sagemath_environment/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-environment ~= 10.9
+sagemath-environment ~= 10.10b0
diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/build/pkgs/sagemath_objects/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-objects ~= 10.9
+sagemath-objects ~= 10.10b0
diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/build/pkgs/sagemath_repl/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-repl ~= 10.9
+sagemath-repl ~= 10.10b0
diff --git a/conftest.py b/conftest.py
@@ -112,7 +112,7 @@ def _find(
                     root=self.config.rootpath,
                     consider_namespace_packages=True,
                 )
-            except ImportError as exception:
+            except ImportError:
                 if self.config.getvalue("doctest_ignore_import_errors"):
                     pytest.skip("unable to import module %r" % self.path)
                 else:

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -90,7 +90,7 @@ RUN ln -s /usr/bin/sage /usr/bin/sagemath
 # We need gcc/g++ to allow compilation of cython at run-time from the notebook.
 # We also install sudo for the sage user, see below.
 RUN apt-get -qq update \
-    && apt-get -qq install -y --no-install-recommends gfortran gcc g++ sudo openssl pkg-config patch libz-dev libbz2-dev bzip2 ca-certificates perl libboost-dev \
+    && apt-get -qq install -y --no-install-recommends gfortran gcc g++ sudo openssl pkg-config patch libz-dev libbz2-dev bzip2 ca-certificates perl libboost-dev python3 python3-dev \
     && apt-get -qq clean \
     && rm -r /var/lib/apt/lists/*
 # Sage refuses to build as root, so we add a "sage" user that can sudo without a password.
@@ -232,7 +232,7 @@ ARG SAGE_ROOT=/home/sage/sage
 COPY --chown=sage:sage --from=make-release $SAGE_ROOT/ $SAGE_ROOT/
 # set path in bashrc to start gap, gp, maxima, ... this does not
 # affect Sage (see https://github.com/sagemath/sage/pull/38049)
-RUN echo "export PATH=$SAGE_ROOT/local/bin:$PATH" >> ~/.bashrc
+RUN echo 'export PATH='"$SAGE_ROOT"'/local/bin:$PATH' >> ~/.bashrc
 
 COPY ./docker/entrypoint.sh /usr/local/bin/sage-entrypoint
 WORKDIR $HOME
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4d326550247377bf4b9226f5d21273dbb9e1026e
		722ddb85e9475978d0b1ef490d6780091279c753