Merge remote-tracking branch 'upstream/develop' into functorial-category-cache-key

Author: user202729

.github/workflows/pyright.yml

@@ -32,7 +32,7 @@ jobs:
           eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git)
 
       - name: Install GH CLI
-        uses: dev-hanz-ops/[email protected].0
+        uses: dev-hanz-ops/[email protected].1
         with:
           gh-cli-version: 2.32.0
 

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.6.beta4
+version: 10.6.beta5
 doi: 10.5281/zenodo.8042260
-date-released: 2025-01-18
+date-released: 2025-01-26
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta4, Release Date: 2025-01-18
+SageMath version 10.6.beta5, Release Date: 2025-01-26

build/bin/sage-spkg

@@ -603,14 +603,14 @@ case "$PKG_SRC" in
 esac
 
 # Poison the proxy variable to forbid downloads in spkg-install
-# for normal packages
-case $PKG_SRC_TYPE in
-  normal|wheel)
-    export http_proxy=http://192.0.2.0:5187/
-    export https_proxy=$http_proxy
-    export ftp_proxy=$http_proxy
-    export rsync_proxy=$http_proxy
-    ;;
+# for normal/wheel standard packages
+case "$PKG_TYPE:$PKG_SRC_TYPE" in
+    standard:normal|standard:wheel)
+        export http_proxy=http://192.0.2.0:5187/
+        export https_proxy=$http_proxy
+        export ftp_proxy=$http_proxy
+        export rsync_proxy=$http_proxy
+        ;;
 esac
 
 # Make sage-logger show the full logs

build/pkgs/ccache/spkg-install.in

@@ -4,7 +4,6 @@ mkdir build
 cd build
 sdh_cmake -DCMAKE_BUILD_TYPE=Release \
           -DENABLE_TESTING=OFF \
-		  -DREDIS_STORAGE_BACKEND=OFF \
 		  ..
 sdh_make
 sdh_make_install

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=f9c1bea6113a6a09430ee1f1aca16c75ed427d48
-sha256=c1e0826fb54dd60e78f19e6fcad0b0ef90b33e1771fbbc2165a54c9297a89557
+sha1=86711d4cbef2cd4e7bb4afcde36965e5dea908e0
+sha256=9793cf92ebdceb09050a585294de93c242c033745a0012cae1bd301d307a45df

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-5eb37241946a9ef9130ce36eff7e4f135d980eaf
+efc0914cd8d72a9bdfdcca4511b55e290b9b6674

build/pkgs/igraph/checksums.ini

@@ -1,4 +1,4 @@
 tarball=igraph-VERSION.tar.gz
-sha1=3789f61beac1f1231f8c3832102dcb2720f2a0c9
-sha256=b011f7f9f38a3e59924cc9ff652e6d33105fa03fcaf3792f47d752626a0a4625
+sha1=af74e361167bd790ed2fcc248acd21ec946ddb2a
+sha256=03ba01db0544c4e32e51ab66f2356a034394533f61b4e14d769b9bbf5ad5e52c
 upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz

build/pkgs/igraph/package-version.txt

@@ -1 +1 @@
-0.10.12
+0.10.15

build/pkgs/igraph/spkg-configure.m4

@@ -3,7 +3,7 @@ SAGE_SPKG_CONFIGURE([igraph], [
     dnl check for igraph with pkg-config
     dnl Per upstream in https://github.com/sagemath/sage/pull/36750#issuecomment-1826998762:
     dnl each python-igraph release is only guaranteed to be compatible with the same C/igraph that it bundles
-    PKG_CHECK_MODULES([IGRAPH], [igraph >= 0.10.12 igraph < 0.10.13], [], [
+    PKG_CHECK_MODULES([IGRAPH], [igraph >= 0.10.14 igraph < 0.10.16], [], [
         sage_spkg_install_igraph=yes])
   ])
 ])