From 627b9f15c516ed2aafffb635a4fab7d78d8b12d6 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Sun, 13 Oct 2024 20:06:09 +0900 Subject: [PATCH 01/15] Introduce negated optional tag --- src/doc/en/developer/coding_basics.rst | 25 ++++++++++++++++++--- src/sage/databases/sloane.py | 22 +++++++++++++++---- src/sage/doctest/parsing.py | 18 ++++++++-------- src/sage/graphs/graph_latex.py | 3 ++- src/sage/groups/perm_gps/cubegroup.py | 30 +++++++++++++------------- 5 files changed, 66 insertions(+), 32 deletions(-) diff --git a/src/doc/en/developer/coding_basics.rst b/src/doc/en/developer/coding_basics.rst index 5e15c4b2455..bd89514cae0 100644 --- a/src/doc/en/developer/coding_basics.rst +++ b/src/doc/en/developer/coding_basics.rst @@ -1258,13 +1258,32 @@ framework. Here is a comprehensive list: - **optional/needs:** A line tagged with ``optional - FEATURE`` or ``needs FEATURE`` is not tested unless the ``--optional=KEYWORD`` flag - is passed to ``sage -t`` (see - :ref:`section-optional-doctest-flag`). The main applications are: + is passed to ``sage -t`` (see :ref:`section-optional-doctest-flag`). + + If ``FEATURE`` starts with an exclamation point ``!``, then the condition is + negated, that is, the doctest runs only if the feature is not available. + + The main applications are: - **optional packages:** When a line requires an optional package to be - installed (e.g. the ``sloane_database`` package):: + installed (e.g. the ``rubiks`` package):: + + sage: C = RubiksCube("R*L") + sage: C.solve() # optional - rubiks (a hybrid algorithm is used) + 'L R' + sage: C.solve() # optional - !rubiks (GAP is used) + 'L*R' + + - **optional database:** When a line requires a database to be present:: sage: SloaneEncyclopedia[60843] # optional - sloane_database + [1, 6, 21, 107, 47176870] + + sage: SloaneEncyclopedia[60843] # optional - !sloane_database + Traceback (most recent call last): + ... + OSError: The Sloane Encyclopedia database must be installed. Use e.g. + 'SloaneEncyclopedia.install()' to download and install it. - **internet:** For lines that require an internet connection:: diff --git a/src/sage/databases/sloane.py b/src/sage/databases/sloane.py index 78fc268b486..aac252d84a8 100644 --- a/src/sage/databases/sloane.py +++ b/src/sage/databases/sloane.py @@ -12,7 +12,7 @@ :: sage: SloaneEncyclopedia[60843] # optional - sloane_database - [1, 6, 21, 107] + [1, 6, 21, 107, 47176870] To get the name of a sequence, type @@ -149,6 +149,17 @@ def __len__(self): self.load() return len(self.__data__) + def is_installed(self): + """ + Check if a local copy of the encyclopedia is installed. + + EXAMPLES:: + + sage: SloaneEncyclopedia.is_installed() # optional - sloane_database + True + """ + return os.path.exists(self.__file__) and os.path.exists(self.__file_names__) + def find(self, seq, maxresults=30): """ Return a list of all sequences which have seq as a subsequence, up @@ -274,7 +285,7 @@ def load(self): for L in file_seq: if len(L) == 0: continue - m = entry.search(L) + m = entry.search(L.decode('utf-8')) if m: seqnum = int(m.group('num')) msg = m.group('body').strip() @@ -287,10 +298,13 @@ def load(self): for L in file_names: if not L: continue - m = entry.search(L) + m = entry.search(L.decode('utf-8')) if m: seqnum = int(m.group('num')) - self.__data__[seqnum][3] = m.group('body').strip() + if seqnum in self.__data__: + self.__data__[seqnum][3] = m.group('body').strip() + else: + self.__data__[seqnum] = [seqnum, None, 'unknown', m.group('body').strip()] file_names.close() self.__loaded_names__ = True except KeyError: diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py index d9b054ae2dd..97d01a6a120 100644 --- a/src/sage/doctest/parsing.py +++ b/src/sage/doctest/parsing.py @@ -58,7 +58,7 @@ special_optional_regex = ( "py2|long time|not implemented|not tested|optional|needs|known bug" ) -tag_with_explanation_regex = r"((?:\w|[.])*)\s*(?:\((?P.*?)\))?" +tag_with_explanation_regex = r"((?:!?\w|[.])*)\s*(?:\((?P.*?)\))?" optional_regex = re.compile( rf"[^ a-z]\s*(?P{special_optional_regex})(?:\s|[:-])*(?P(?:(?:{tag_with_explanation_regex})\s*)*)", re.IGNORECASE, @@ -1124,14 +1124,14 @@ def check_and_clear_tag_counts(): continue if self.optional_tags is not True: - extra = { - tag - for tag in optional_tags - if ( - tag not in self.optional_tags - and tag not in available_software - ) - } + extra = set() + for tag in optional_tags: + if tag not in self.optional_tags: + if tag.startswith('!'): + if tag[1:] in available_software: + extra.add(tag) + elif tag not in available_software: + extra.add(tag) if extra and any(tag in ["bug"] for tag in extra): # Bug only occurs on a specific platform? bug_platform = optional_tags_with_values.get("bug") diff --git a/src/sage/graphs/graph_latex.py b/src/sage/graphs/graph_latex.py index f0fb9329002..12fe5c6ed99 100644 --- a/src/sage/graphs/graph_latex.py +++ b/src/sage/graphs/graph_latex.py @@ -207,6 +207,7 @@ % \end{tikzpicture} + EXAMPLES: This example illustrates switching between the built-in styles when using the @@ -1566,7 +1567,7 @@ def tkz_picture(self): For a complicated vertex, a TeX box is used. :: sage: B = crystals.Tableaux(['B', 2], shape=[1]) - sage: latex(B) + sage: latex(B) # optional - !dot2tex \begin{tikzpicture} ... \newsavebox{\vertex} diff --git a/src/sage/groups/perm_gps/cubegroup.py b/src/sage/groups/perm_gps/cubegroup.py index 8eadbac39f1..fffdbe84753 100644 --- a/src/sage/groups/perm_gps/cubegroup.py +++ b/src/sage/groups/perm_gps/cubegroup.py @@ -1420,7 +1420,7 @@ def __richcmp__(self, other, op): return NotImplemented return richcmp(self._state, other._state, op) - def solve(self, algorithm='hybrid', timeout=15): + def solve(self, algorithm='default', timeout=15): r""" Solve the Rubik's cube. @@ -1428,17 +1428,14 @@ def solve(self, algorithm='hybrid', timeout=15): - ``algorithm`` -- must be one of the following: - - ``hybrid`` -- try ``kociemba`` for timeout seconds, then ``dietz`` - - ``kociemba`` -- use Dik T. Winter's program - (reasonable speed, few moves) - - ``dietz`` -- use Eric Dietz's cubex program - (fast but lots of moves) - - ``optimal`` -- use Michael Reid's optimal program - (may take a long time) + - ``hybrid`` -- (default) try ``kociemba`` for timeout seconds, then ``dietz`` + - ``kociemba`` -- use Dik T. Winter's program (reasonable speed, few moves) + - ``dietz`` -- use Eric Dietz's cubex program (fast but lots of moves) + - ``optimal`` -- use Michael Reid's optimal program (may take a long time) - ``gap`` -- use GAP word solution (can be slow) - Any choice other than ``gap`` requires the optional package - ``rubiks``. Otherwise, the ``gap`` algorithm is used. + Any choice other than ``gap`` requires the optional package ``rubiks``. + If the package is not installed, the ``gap`` algorithm is used by default. EXAMPLES:: @@ -1450,7 +1447,10 @@ def solve(self, algorithm='hybrid', timeout=15): solutions:: sage: s = C.solve('dietz'); s # optional - rubiks - "U' L' L' U L U' L U D L L D' L' D L' D' L D L' U' L D' L' U L' B' U' L' U B L D L D' U' L' U L B L B' L' U L U' L' F' L' F L' F L F' L' D' L' D D L D' B L B' L B' L B F' L F F B' L F' B D' D' L D B' B' L' D' B U' U' L' B' D' F' F' L D F'" + "U' L' L' U L U' L U D L L D' L' D L' D' L D L' U' L D' L' U L' B' + U' L' U B L D L D' U' L' U L B L B' L' U L U' L' F' L' F L' F L F' + L' D' L' D D L D' B L B' L B' L B F' L F F B' L F' B D' D' L D B' + B' L' D' B U' U' L' B' D' F' F' L D F'" sage: C2 = RubiksCube(s) # optional - rubiks sage: C == C2 # optional - rubiks True @@ -1458,11 +1458,11 @@ def solve(self, algorithm='hybrid', timeout=15): from sage.features.rubiks import Rubiks if Rubiks().is_present(): import sage.interfaces.rubik # here to avoid circular referencing + if algorithm == 'default': + algorithm = "hybrid" else: - algorithm = 'gap' - - if algorithm == "default": - algorithm = "hybrid" + if algorithm == 'default': + algorithm = 'gap' if algorithm == "hybrid": try: From d7db870dedecfa4d106338ed9e578a41de6d9876 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Sun, 13 Oct 2024 23:22:11 +0900 Subject: [PATCH 02/15] Edit optional needs tags explanation --- src/doc/en/developer/coding_basics.rst | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/doc/en/developer/coding_basics.rst b/src/doc/en/developer/coding_basics.rst index bd89514cae0..9b56de46ad0 100644 --- a/src/doc/en/developer/coding_basics.rst +++ b/src/doc/en/developer/coding_basics.rst @@ -6,7 +6,6 @@ General Conventions =================== - There are many ways to contribute to Sage, including sharing scripts and Jupyter notebooks that implement new functionality using Sage, improving to the Sage library, or to working on the many underlying @@ -1256,13 +1255,15 @@ framework. Here is a comprehensive list: Neither of this applies to files or directories which are explicitly given as command line arguments: those are always tested. -- **optional/needs:** A line tagged with ``optional - FEATURE`` - or ``needs FEATURE`` is not tested unless the ``--optional=KEYWORD`` flag - is passed to ``sage -t`` (see :ref:`section-optional-doctest-flag`). - - If ``FEATURE`` starts with an exclamation point ``!``, then the condition is +- **optional** or **needs:** A line tagged with ``optional - FEATURE`` or + ``needs FEATURE`` is tested if the feature is available in Sage. If + ``FEATURE`` starts with an exclamation point ``!``, then the condition is negated, that is, the doctest runs only if the feature is not available. + If the feature is included in the ``--optional=KEYWORD`` flag passed to + ``sage -t`` (see :ref:`section-optional-doctest-flag`), then the line is + tested regardless of the feature availability. + The main applications are: - **optional packages:** When a line requires an optional package to be @@ -1274,7 +1275,7 @@ framework. Here is a comprehensive list: sage: C.solve() # optional - !rubiks (GAP is used) 'L*R' - - **optional database:** When a line requires a database to be present:: + - **features:** When a line requires a feature to be present:: sage: SloaneEncyclopedia[60843] # optional - sloane_database [1, 6, 21, 107, 47176870] @@ -1285,7 +1286,7 @@ framework. Here is a comprehensive list: OSError: The Sloane Encyclopedia database must be installed. Use e.g. 'SloaneEncyclopedia.install()' to download and install it. - - **internet:** For lines that require an internet connection:: + For lines that require an internet connection:: sage: oeis(60843) # optional - internet A060843: Busy Beaver problem: a(n) = maximal number of steps that an From 71197264e74f9537d19fa5c1ae0e8fc1bb2f47f9 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Wed, 16 Oct 2024 06:54:48 +0900 Subject: [PATCH 03/15] Add features --- src/sage/features/dot2tex.py | 42 +++++++++++++++++++++ src/sage/features/sloane_database.py | 56 ++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 src/sage/features/dot2tex.py create mode 100644 src/sage/features/sloane_database.py diff --git a/src/sage/features/dot2tex.py b/src/sage/features/dot2tex.py new file mode 100644 index 00000000000..e9f97b6e704 --- /dev/null +++ b/src/sage/features/dot2tex.py @@ -0,0 +1,42 @@ +# sage_setup: distribution = sagemath-environment +r""" +Check for ``dot2tex`` +""" + +# ***************************************************************************** +# Copyright (C) 2024 Kwankyu Lee +# +# Distributed under the terms of the GNU General Public License (GPL) +# as published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# https://www.gnu.org/licenses/ +# ***************************************************************************** + +from . import PythonModule + + +class dot2tex(PythonModule): + r""" + A :class:`sage.features.Feature` describing the presence of :ref:`dot2tex `. + + dot2tex is provided by an optional package in the Sage distribution. + + EXAMPLES:: + + sage: from sage.features.dot2tex import dot2tex + sage: dot2tex().is_present() # optional - dot2tex + FeatureTestResult('dot2tex', True) + """ + def __init__(self): + r""" + TESTS:: + + sage: from sage.features.dot2tex import dot2tex + sage: isinstance(dot2tex(), dot2tex) + True + """ + PythonModule.__init__(self, 'dot2tex', spkg='dot2tex') + + +def all_features(): + return [dot2tex()] diff --git a/src/sage/features/sloane_database.py b/src/sage/features/sloane_database.py new file mode 100644 index 00000000000..9abfbea8891 --- /dev/null +++ b/src/sage/features/sloane_database.py @@ -0,0 +1,56 @@ +# sage_setup: distribution = sagemath-environment +r""" +Feature for testing the presence of Sloane Online Encyclopedia of Integer Sequences +""" + +# **************************************************************************** +# Copyright (C) 2024 Kwankyu Lee +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# https://www.gnu.org/licenses/ +# **************************************************************************** + +from . import Feature + + +class SloaneOEIS(Feature): + r""" + A :class:`~sage.features.Feature` which describes the presence of + the Sloane Online Encyclopedia of Integer Sequences. + + EXAMPLES:: + + sage: from sage.features.sloane_database import SloaneOEIS + sage: bool(SloaneOEIS().is_present()) # optional - sloane_database + True + """ + def __init__(self): + r""" + TESTS:: + + sage: from sage.features.sloane_database import SloaneOEIS + sage: isinstance(SloaneOEIS(), SloaneOEIS) + True + """ + Feature.__init__(self, name='sloane_database', + description='Sloane Online Encyclopedia of Integer Sequences') + + def _is_present(self): + r""" + Return whether the database is installed. + + EXAMPLES:: + + sage: from sage.features.sloane_database import SloaneOEIS + sage: bool(SloaneOEIS().is_present()) # optional - !sloane_database + False + """ + from sage.databases.sloane import SloaneEncyclopedia + return SloaneEncyclopedia.is_installed() + + +def all_features(): + return [SloaneOEIS()] From 0812d9d5ea96a1d956450c9b6abaf3b18547dbff Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Wed, 16 Oct 2024 15:02:25 +0900 Subject: [PATCH 04/15] Fix modularization regression --- src/sage/features/sloane_database.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sage/features/sloane_database.py b/src/sage/features/sloane_database.py index 9abfbea8891..84aad5ce67a 100644 --- a/src/sage/features/sloane_database.py +++ b/src/sage/features/sloane_database.py @@ -40,7 +40,7 @@ def __init__(self): def _is_present(self): r""" - Return whether the database is installed. + Return whether the database is available. EXAMPLES:: @@ -48,7 +48,10 @@ def _is_present(self): sage: bool(SloaneOEIS().is_present()) # optional - !sloane_database False """ - from sage.databases.sloane import SloaneEncyclopedia + try: + from sage.databases.sloane import SloaneEncyclopedia + except ImportError: + return False return SloaneEncyclopedia.is_installed() From 4ca8c0dae5b1ac957985eddfdf5f928f5df9f839 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Thu, 17 Oct 2024 00:22:51 +0900 Subject: [PATCH 05/15] Delete a spurious empty line --- src/sage/graphs/graph_latex.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sage/graphs/graph_latex.py b/src/sage/graphs/graph_latex.py index 12fe5c6ed99..f50758496c4 100644 --- a/src/sage/graphs/graph_latex.py +++ b/src/sage/graphs/graph_latex.py @@ -207,7 +207,6 @@ % \end{tikzpicture} - EXAMPLES: This example illustrates switching between the built-in styles when using the From d1bd1b59b5a00c2e594adc8c9fa0bf795386ff01 Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Sun, 17 Nov 2024 01:19:25 +0100 Subject: [PATCH 06/15] Python3 build does not find openssl without pkgconf --- build/pkgs/python3/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/python3/dependencies b/build/pkgs/python3/dependencies index c00db7fa1e0..d703ce7ab69 100644 --- a/build/pkgs/python3/dependencies +++ b/build/pkgs/python3/dependencies @@ -1,4 +1,4 @@ -zlib readline sqlite libpng bzip2 liblzma libffi openssl | xz +zlib readline sqlite libpng bzip2 liblzma libffi openssl | xz pkgconf ---------- All lines of this file are ignored except the first. From 60fdd034794f8b6fd7c285658d36f219681e3034 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Sun, 17 Nov 2024 16:59:21 +0900 Subject: [PATCH 07/15] Materialize literal-blocks list before modifying nodes --- src/sage_docbuild/conf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sage_docbuild/conf.py b/src/sage_docbuild/conf.py index 18ce9f7663e..c4d1df3d23b 100644 --- a/src/sage_docbuild/conf.py +++ b/src/sage_docbuild/conf.py @@ -954,7 +954,7 @@ class SagecodeTransform(SphinxTransform): def apply(self): if self.app.builder.tags.has('html') or self.app.builder.tags.has('inventory'): - for node in self.document.findall(nodes.literal_block): + for node in list(self.document.findall(nodes.literal_block)): if node.get('language') is None and node.astext().startswith('sage:'): from docutils.nodes import container as Container, label as Label, literal_block as LiteralBlock, Text from sphinx_inline_tabs._impl import TabContainer @@ -963,7 +963,8 @@ def apply(self): prev_node = node.previous_sibling() if isinstance(node.previous_sibling(), TabContainer): # Make sure not to merge inline tabs for adjacent literal blocks - parent.insert(index, Text('')) + parent.insert(index, nodes.paragraph()) + prev_node = parent[index] index += 1 parent.remove(node) # Tab for Sage code @@ -1102,3 +1103,4 @@ def feature_tags(): for feature in all_features(): if feature.is_present(): yield 'feature_' + feature.name.replace('.', '_') + From 7279faaee85269c1601b6c7842010fc552d29a5a Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Mon, 18 Nov 2024 14:33:01 +0900 Subject: [PATCH 08/15] Add a small improvement --- src/sage_docbuild/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sage_docbuild/conf.py b/src/sage_docbuild/conf.py index c4d1df3d23b..d90c2eb2dd1 100644 --- a/src/sage_docbuild/conf.py +++ b/src/sage_docbuild/conf.py @@ -961,7 +961,7 @@ def apply(self): parent = node.parent index = parent.index(node) prev_node = node.previous_sibling() - if isinstance(node.previous_sibling(), TabContainer): + if isinstance(prev_node, TabContainer): # Make sure not to merge inline tabs for adjacent literal blocks parent.insert(index, nodes.paragraph()) prev_node = parent[index] @@ -1103,4 +1103,3 @@ def feature_tags(): for feature in all_features(): if feature.is_present(): yield 'feature_' + feature.name.replace('.', '_') - From 837740309ffbc47f340534ed9fd163d2ee4c1495 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Mon, 18 Nov 2024 23:02:58 +0900 Subject: [PATCH 09/15] Do not upload logs artifact for the default job --- .github/workflows/ci-linux.yml | 1 + .github/workflows/docker.yml | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index ca4607e3cc3..1bf8862b4f4 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -50,6 +50,7 @@ jobs: tox_packages_factors: >- ["standard"] docker_push_repository: ghcr.io/${{ github.repository }}/ + logs_artifact: false # All platforms. This duplicates the default platform, but why not, # it makes it more robust regarding random timeouts. diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a7d5ecc8835..96427164eae 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -85,6 +85,9 @@ on: description: 'Elapsed time (seconds) at which to kill the build' default: 20000 type: number + logs_artifact: + default: true + type: boolean # # Publishing to GitHub Packages # @@ -260,11 +263,12 @@ jobs: cp -r .tox/$TOX_ENV/* "artifacts/$LOGS_ARTIFACT_NAME" rm -rf "artifacts/$LOGS_ARTIFACT_NAME"/{bin,lib,pyvenv.cfg} if: always() - - uses: actions/upload-artifact@v4 + - name: Upload logs artifact + uses: actions/upload-artifact@v4 with: path: artifacts name: ${{ env.LOGS_ARTIFACT_NAME }} - if: always() + if: always() && inputs.logs_artifact - name: Print out logs for immediate inspection # and markup the output with GitHub Actions logging commands run: | From b9e396a7444167fb334b12a5b41db9af0cfa8ef0 Mon Sep 17 00:00:00 2001 From: Release Manager Date: Sat, 23 Nov 2024 11:49:49 +0100 Subject: [PATCH 10/15] Updated SageMath version to 10.5.rc1 --- CITATION.cff | 4 ++-- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 4 ++-- build/pkgs/configure/package-version.txt | 2 +- build/pkgs/sage_conf/version_requirements.txt | 2 +- build/pkgs/sage_docbuild/version_requirements.txt | 2 +- build/pkgs/sage_setup/version_requirements.txt | 2 +- build/pkgs/sage_sws2rst/version_requirements.txt | 2 +- build/pkgs/sagelib/version_requirements.txt | 2 +- build/pkgs/sagemath_bliss/version_requirements.txt | 2 +- build/pkgs/sagemath_categories/version_requirements.txt | 2 +- build/pkgs/sagemath_coxeter3/version_requirements.txt | 2 +- build/pkgs/sagemath_environment/version_requirements.txt | 2 +- build/pkgs/sagemath_mcqd/version_requirements.txt | 2 +- build/pkgs/sagemath_meataxe/version_requirements.txt | 2 +- build/pkgs/sagemath_objects/version_requirements.txt | 2 +- build/pkgs/sagemath_repl/version_requirements.txt | 2 +- build/pkgs/sagemath_sirocco/version_requirements.txt | 2 +- build/pkgs/sagemath_tdlib/version_requirements.txt | 2 +- pkgs/sage-conf/VERSION.txt | 2 +- pkgs/sage-conf_conda/VERSION.txt | 2 +- pkgs/sage-conf_pypi/VERSION.txt | 2 +- pkgs/sage-docbuild/VERSION.txt | 2 +- pkgs/sage-setup/VERSION.txt | 2 +- pkgs/sage-sws2rst/VERSION.txt | 2 +- pkgs/sagemath-bliss/VERSION.txt | 2 +- pkgs/sagemath-categories/VERSION.txt | 2 +- pkgs/sagemath-coxeter3/VERSION.txt | 2 +- pkgs/sagemath-environment/VERSION.txt | 2 +- pkgs/sagemath-mcqd/VERSION.txt | 2 +- pkgs/sagemath-meataxe/VERSION.txt | 2 +- pkgs/sagemath-objects/VERSION.txt | 2 +- pkgs/sagemath-repl/VERSION.txt | 2 +- pkgs/sagemath-sirocco/VERSION.txt | 2 +- pkgs/sagemath-tdlib/VERSION.txt | 2 +- src/VERSION.txt | 2 +- src/bin/sage-version.sh | 6 +++--- src/sage/version.py | 6 +++--- 38 files changed, 44 insertions(+), 44 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index c2d778402ac..846dc8d56de 100644 --- 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.5.rc0 +version: 10.5.rc1 doi: 10.5281/zenodo.8042260 -date-released: 2024-11-16 +date-released: 2024-11-23 repository-code: "https://github.com/sagemath/sage" url: "https://www.sagemath.org/" diff --git a/VERSION.txt b/VERSION.txt index 539643e825a..eb2ad2d41d0 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 10.5.rc0, Release Date: 2024-11-16 +SageMath version 10.5.rc1, Release Date: 2024-11-23 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 3a59fabe4df..c572b3c4604 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,3 +1,3 @@ tarball=configure-VERSION.tar.gz -sha1=75d6eb488fd370ea17699188dabf78afa295d6d9 -sha256=679c7a5c352eeac458ee6574326208df1bc0b30be5c803b952e19a9d2a8b7d32 +sha1=4b08e1c0e6b812bfbade59ef7c751619d8e44f81 +sha256=9ae6ed35a2391f1af02ed2c7b855670d3db0bb421a69064a2c907b4f3a584eb4 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 1a46ad3eaf8..fe064f68b5e 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -659705e89638fae6821783730c357bf292ebed6e +95eb9b8c8642831f849b5fec82a0b545a95e9ca6 diff --git a/build/pkgs/sage_conf/version_requirements.txt b/build/pkgs/sage_conf/version_requirements.txt index 75a00f0f83b..9d4b482d5a4 100644 --- a/build/pkgs/sage_conf/version_requirements.txt +++ b/build/pkgs/sage_conf/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-conf ~= 10.5rc0 +sage-conf ~= 10.5rc1 diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/build/pkgs/sage_docbuild/version_requirements.txt index 6e02f12a485..cc82b61571d 100644 --- 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 sage-update-version script -sage-docbuild ~= 10.5rc0 +sage-docbuild ~= 10.5rc1 diff --git a/build/pkgs/sage_setup/version_requirements.txt b/build/pkgs/sage_setup/version_requirements.txt index af4273ca5a6..1ff54dc7d60 100644 --- 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 sage-update-version script -sage-setup ~= 10.5rc0 +sage-setup ~= 10.5rc1 diff --git a/build/pkgs/sage_sws2rst/version_requirements.txt b/build/pkgs/sage_sws2rst/version_requirements.txt index f6461b249ee..1c2539d939c 100644 --- a/build/pkgs/sage_sws2rst/version_requirements.txt +++ b/build/pkgs/sage_sws2rst/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-sws2rst ~= 10.5rc0 +sage-sws2rst ~= 10.5rc1 diff --git a/build/pkgs/sagelib/version_requirements.txt b/build/pkgs/sagelib/version_requirements.txt index a5764ac2ff3..43b9a42f129 100644 --- a/build/pkgs/sagelib/version_requirements.txt +++ b/build/pkgs/sagelib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-standard ~= 10.5rc0 +sagemath-standard ~= 10.5rc1 diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/build/pkgs/sagemath_bliss/version_requirements.txt index 54e31199a21..2368924f603 100644 --- a/build/pkgs/sagemath_bliss/version_requirements.txt +++ b/build/pkgs/sagemath_bliss/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-bliss ~= 10.5rc0 +sagemath-bliss ~= 10.5rc1 diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/build/pkgs/sagemath_categories/version_requirements.txt index 24190dcde29..12dbd988f69 100644 --- 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 sage-update-version script -sagemath-categories ~= 10.5rc0 +sagemath-categories ~= 10.5rc1 diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt index d583b886874..68b68b8849a 100644 --- a/build/pkgs/sagemath_coxeter3/version_requirements.txt +++ b/build/pkgs/sagemath_coxeter3/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-coxeter3 ~= 10.5rc0 +sagemath-coxeter3 ~= 10.5rc1 diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/build/pkgs/sagemath_environment/version_requirements.txt index 4c460e8258e..90066e303ad 100644 --- 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 sage-update-version script -sagemath-environment ~= 10.5rc0 +sagemath-environment ~= 10.5rc1 diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt index 394ab1ab42c..f41ce17c20b 100644 --- a/build/pkgs/sagemath_mcqd/version_requirements.txt +++ b/build/pkgs/sagemath_mcqd/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-mcqd ~= 10.5rc0 +sagemath-mcqd ~= 10.5rc1 diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt index e3b1b8d80dd..f8304228dbc 100644 --- a/build/pkgs/sagemath_meataxe/version_requirements.txt +++ b/build/pkgs/sagemath_meataxe/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-meataxe ~= 10.5rc0 +sagemath-meataxe ~= 10.5rc1 diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/build/pkgs/sagemath_objects/version_requirements.txt index 84f9308c624..990a0601e08 100644 --- 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 sage-update-version script -sagemath-objects ~= 10.5rc0 +sagemath-objects ~= 10.5rc1 diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/build/pkgs/sagemath_repl/version_requirements.txt index 124091c62c1..7ab5cec5f5b 100644 --- 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 sage-update-version script -sagemath-repl ~= 10.5rc0 +sagemath-repl ~= 10.5rc1 diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt index 57ed9f87891..0863567dacc 100644 --- a/build/pkgs/sagemath_sirocco/version_requirements.txt +++ b/build/pkgs/sagemath_sirocco/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-sirocco ~= 10.5rc0 +sagemath-sirocco ~= 10.5rc1 diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt index ea110e02460..847534f161e 100644 --- a/build/pkgs/sagemath_tdlib/version_requirements.txt +++ b/build/pkgs/sagemath_tdlib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-tdlib ~= 10.5rc0 +sagemath-tdlib ~= 10.5rc1 diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sage-conf/VERSION.txt +++ b/pkgs/sage-conf/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sage-conf_conda/VERSION.txt +++ b/pkgs/sage-conf_conda/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sage-conf_pypi/VERSION.txt +++ b/pkgs/sage-conf_pypi/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sage-docbuild/VERSION.txt +++ b/pkgs/sage-docbuild/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sage-setup/VERSION.txt +++ b/pkgs/sage-setup/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sage-sws2rst/VERSION.txt +++ b/pkgs/sage-sws2rst/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-bliss/VERSION.txt +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-categories/VERSION.txt +++ b/pkgs/sagemath-categories/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-environment/VERSION.txt +++ b/pkgs/sagemath-environment/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-objects/VERSION.txt +++ b/pkgs/sagemath-objects/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-repl/VERSION.txt +++ b/pkgs/sagemath-repl/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/src/VERSION.txt b/src/VERSION.txt index 9228dedd0ce..d2205320557 100644 --- a/src/VERSION.txt +++ b/src/VERSION.txt @@ -1 +1 @@ -10.5.rc0 +10.5.rc1 diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 9c1fb9c0309..bafb8fc6368 100644 --- a/src/bin/sage-version.sh +++ b/src/bin/sage-version.sh @@ -4,6 +4,6 @@ # which stops "setup.py develop" from rewriting it as a Python file. : # This file is auto-generated by the sage-update-version script, do not edit! -SAGE_VERSION='10.5.rc0' -SAGE_RELEASE_DATE='2024-11-16' -SAGE_VERSION_BANNER='SageMath version 10.5.rc0, Release Date: 2024-11-16' +SAGE_VERSION='10.5.rc1' +SAGE_RELEASE_DATE='2024-11-23' +SAGE_VERSION_BANNER='SageMath version 10.5.rc1, Release Date: 2024-11-23' diff --git a/src/sage/version.py b/src/sage/version.py index d05ce0beb53..eeb9eae6692 100644 --- a/src/sage/version.py +++ b/src/sage/version.py @@ -1,5 +1,5 @@ # Sage version information for Python scripts # This file is auto-generated by the sage-update-version script, do not edit! -version = '10.5.rc0' -date = '2024-11-16' -banner = 'SageMath version 10.5.rc0, Release Date: 2024-11-16' +version = '10.5.rc1' +date = '2024-11-23' +banner = 'SageMath version 10.5.rc1, Release Date: 2024-11-23' From f211bdcac6b9088671339aebfe77f78d0d9fab3f Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 17 Nov 2024 20:12:24 +0800 Subject: [PATCH 11/15] Fix meson build by adding missing python files --- src/meson.build | 6 +----- src/sage/matroids/meson.build | 2 ++ src/sage/rings/meson.build | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index 10ce96a8da2..31544d29dbd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -78,11 +78,7 @@ endif # that too to make the fallback detection with CMake work blas_order += ['cblas', 'openblas', 'OpenBLAS', 'flexiblas', 'blis', 'blas'] blas = dependency(blas_order) -gsl = dependency( - 'gsl', - version: '>=2.5', - required: true, -) +gsl = dependency('gsl', version: '>=2.5', required: true) gd = cc.find_library('gd') # Only some platforms have a standalone math library (https://mesonbuild.com/howtox.html#add-math-library-lm-portably) m = cc.find_library('m', required: false) diff --git a/src/sage/matroids/meson.build b/src/sage/matroids/meson.build index 43c80789811..f60970da5b9 100644 --- a/src/sage/matroids/meson.build +++ b/src/sage/matroids/meson.build @@ -4,6 +4,8 @@ py.install_sources( 'basis_exchange_matroid.pxd', 'basis_matroid.pxd', 'catalog.py', + 'chow_ring.py', + 'chow_ring_ideal.py', 'circuit_closures_matroid.pxd', 'circuits_matroid.pxd', 'constructor.py', diff --git a/src/sage/rings/meson.build b/src/sage/rings/meson.build index 14ed48a7c7a..171592eccbd 100644 --- a/src/sage/rings/meson.build +++ b/src/sage/rings/meson.build @@ -72,6 +72,7 @@ py.install_sources( 'ring_extension_element.pxd', 'ring_extension_homset.py', 'ring_extension_morphism.pxd', + 'species.py', 'sum_of_squares.pxd', 'tate_algebra.py', 'tate_algebra_element.pxd', From 7ce18777a7e6784a9d123ceb5f279d99d51958ba Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Tue, 26 Nov 2024 10:00:00 -0600 Subject: [PATCH 12/15] the patch breaks some macOS installations --- build/pkgs/ecm/patches/assembler.patch | 67 -------------------------- 1 file changed, 67 deletions(-) delete mode 100644 build/pkgs/ecm/patches/assembler.patch diff --git a/build/pkgs/ecm/patches/assembler.patch b/build/pkgs/ecm/patches/assembler.patch deleted file mode 100644 index 2e3d6c94b6d..00000000000 --- a/build/pkgs/ecm/patches/assembler.patch +++ /dev/null @@ -1,67 +0,0 @@ -*** a/x86_64/Makefile.in Mon Nov 4 14:08:05 2024 ---- b/x86_64/Makefile.in Mon Nov 4 14:15:46 2024 -*************** -*** 355,361 **** - all: all-am - - .SUFFIXES: -! .SUFFIXES: .asm .lo .o .obj .s - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ ---- 355,361 ---- - all: all-am - - .SUFFIXES: -! .SUFFIXES: .asm .lo .o .obj .sx - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ -*************** -*** 406,418 **** - distclean-compile: - -rm -f *.tab.c - -! .s.o: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ $< - -! .s.obj: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -! .s.lo: - $(AM_V_CCAS)$(LTCCASCOMPILE) -c -o $@ $< - - mostlyclean-libtool: ---- 406,418 ---- - distclean-compile: - -rm -f *.tab.c - -! .sx.o: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ $< - -! .sx.obj: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -! .sx.lo: - $(AM_V_CCAS)$(LTCCASCOMPILE) -c -o $@ $< - - mostlyclean-libtool: -*************** -*** 706,713 **** - mulredc1_20.asm: mulredc1.m4 - $(M4) -DLENGTH=20 $< > $@ - -! .asm.s: -! $(M4) -I../ -DOPERATION_$* `test -f $< || echo '$(srcdir)/'`$< >$*.s - # Nothing here needs the C preprocessor, and including this rule causes - # "make" to build .S, then .s files which fails on case-insensitive - # filesystems ---- 706,713 ---- - mulredc1_20.asm: mulredc1.m4 - $(M4) -DLENGTH=20 $< > $@ - -! .asm.sx: -! $(M4) -I../ -DOPERATION_$* `test -f $< || echo '$(srcdir)/'`$< >$*.sx - # Nothing here needs the C preprocessor, and including this rule causes - # "make" to build .S, then .s files which fails on case-insensitive - # filesystems From bf16199c92824caf46197468bea60f7d68f0809c Mon Sep 17 00:00:00 2001 From: Release Manager Date: Sat, 30 Nov 2024 11:15:58 +0100 Subject: [PATCH 13/15] Updated SageMath version to 10.5.rc2 --- CITATION.cff | 4 ++-- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 4 ++-- build/pkgs/configure/package-version.txt | 2 +- build/pkgs/sage_conf/version_requirements.txt | 2 +- build/pkgs/sage_docbuild/version_requirements.txt | 2 +- build/pkgs/sage_setup/version_requirements.txt | 2 +- build/pkgs/sage_sws2rst/version_requirements.txt | 2 +- build/pkgs/sagelib/version_requirements.txt | 2 +- build/pkgs/sagemath_bliss/version_requirements.txt | 2 +- build/pkgs/sagemath_categories/version_requirements.txt | 2 +- build/pkgs/sagemath_coxeter3/version_requirements.txt | 2 +- build/pkgs/sagemath_environment/version_requirements.txt | 2 +- build/pkgs/sagemath_mcqd/version_requirements.txt | 2 +- build/pkgs/sagemath_meataxe/version_requirements.txt | 2 +- build/pkgs/sagemath_objects/version_requirements.txt | 2 +- build/pkgs/sagemath_repl/version_requirements.txt | 2 +- build/pkgs/sagemath_sirocco/version_requirements.txt | 2 +- build/pkgs/sagemath_tdlib/version_requirements.txt | 2 +- pkgs/sage-conf/VERSION.txt | 2 +- pkgs/sage-conf_conda/VERSION.txt | 2 +- pkgs/sage-conf_pypi/VERSION.txt | 2 +- pkgs/sage-docbuild/VERSION.txt | 2 +- pkgs/sage-setup/VERSION.txt | 2 +- pkgs/sage-sws2rst/VERSION.txt | 2 +- pkgs/sagemath-bliss/VERSION.txt | 2 +- pkgs/sagemath-categories/VERSION.txt | 2 +- pkgs/sagemath-coxeter3/VERSION.txt | 2 +- pkgs/sagemath-environment/VERSION.txt | 2 +- pkgs/sagemath-mcqd/VERSION.txt | 2 +- pkgs/sagemath-meataxe/VERSION.txt | 2 +- pkgs/sagemath-objects/VERSION.txt | 2 +- pkgs/sagemath-repl/VERSION.txt | 2 +- pkgs/sagemath-sirocco/VERSION.txt | 2 +- pkgs/sagemath-tdlib/VERSION.txt | 2 +- src/VERSION.txt | 2 +- src/bin/sage-version.sh | 6 +++--- src/sage/version.py | 6 +++--- 38 files changed, 44 insertions(+), 44 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 846dc8d56de..c0dbf3d6a37 100644 --- 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.5.rc1 +version: 10.5.rc2 doi: 10.5281/zenodo.8042260 -date-released: 2024-11-23 +date-released: 2024-11-30 repository-code: "https://github.com/sagemath/sage" url: "https://www.sagemath.org/" diff --git a/VERSION.txt b/VERSION.txt index eb2ad2d41d0..219cada0e3f 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 10.5.rc1, Release Date: 2024-11-23 +SageMath version 10.5.rc2, Release Date: 2024-11-30 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 40047be516c..7d0a957c854 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,3 +1,3 @@ tarball=configure-VERSION.tar.gz -sha1=873cdf7d49278239555a9887f13f22da05fb20a6 -sha256=2e02aa16c42dab86849ca6d53d6148a414c56e93177bb9cf7346df84a8315b2f +sha1=4d6de7b4a5aff43a508a1e64078fe409554869fe +sha256=18cc6fa95c0bd6ae0bf1f9b447ae2dd9da7d596d17bec5e961b980b9687e1a7e diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 1ec5d4eba60..8c7663a9fa1 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -34bd0eca0efef4b5aae919be1286ec45a9622f64 +68f446ad3f1abcea6e1a9b679a04242597f439f6 diff --git a/build/pkgs/sage_conf/version_requirements.txt b/build/pkgs/sage_conf/version_requirements.txt index 9d4b482d5a4..11ae1c5d2a5 100644 --- a/build/pkgs/sage_conf/version_requirements.txt +++ b/build/pkgs/sage_conf/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-conf ~= 10.5rc1 +sage-conf ~= 10.5rc2 diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/build/pkgs/sage_docbuild/version_requirements.txt index cc82b61571d..b2dd3fbec85 100644 --- 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 sage-update-version script -sage-docbuild ~= 10.5rc1 +sage-docbuild ~= 10.5rc2 diff --git a/build/pkgs/sage_setup/version_requirements.txt b/build/pkgs/sage_setup/version_requirements.txt index 1ff54dc7d60..c9bffddf1dc 100644 --- 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 sage-update-version script -sage-setup ~= 10.5rc1 +sage-setup ~= 10.5rc2 diff --git a/build/pkgs/sage_sws2rst/version_requirements.txt b/build/pkgs/sage_sws2rst/version_requirements.txt index 1c2539d939c..44d72b63d93 100644 --- a/build/pkgs/sage_sws2rst/version_requirements.txt +++ b/build/pkgs/sage_sws2rst/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-sws2rst ~= 10.5rc1 +sage-sws2rst ~= 10.5rc2 diff --git a/build/pkgs/sagelib/version_requirements.txt b/build/pkgs/sagelib/version_requirements.txt index 43b9a42f129..49cf1f431c8 100644 --- a/build/pkgs/sagelib/version_requirements.txt +++ b/build/pkgs/sagelib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-standard ~= 10.5rc1 +sagemath-standard ~= 10.5rc2 diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/build/pkgs/sagemath_bliss/version_requirements.txt index 2368924f603..97488091046 100644 --- a/build/pkgs/sagemath_bliss/version_requirements.txt +++ b/build/pkgs/sagemath_bliss/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-bliss ~= 10.5rc1 +sagemath-bliss ~= 10.5rc2 diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/build/pkgs/sagemath_categories/version_requirements.txt index 12dbd988f69..38d0f576482 100644 --- 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 sage-update-version script -sagemath-categories ~= 10.5rc1 +sagemath-categories ~= 10.5rc2 diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt index 68b68b8849a..74fcc5180f1 100644 --- a/build/pkgs/sagemath_coxeter3/version_requirements.txt +++ b/build/pkgs/sagemath_coxeter3/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-coxeter3 ~= 10.5rc1 +sagemath-coxeter3 ~= 10.5rc2 diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/build/pkgs/sagemath_environment/version_requirements.txt index 90066e303ad..17b0f996c23 100644 --- 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 sage-update-version script -sagemath-environment ~= 10.5rc1 +sagemath-environment ~= 10.5rc2 diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt index f41ce17c20b..e25bbd7cbf5 100644 --- a/build/pkgs/sagemath_mcqd/version_requirements.txt +++ b/build/pkgs/sagemath_mcqd/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-mcqd ~= 10.5rc1 +sagemath-mcqd ~= 10.5rc2 diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt index f8304228dbc..839d6691290 100644 --- a/build/pkgs/sagemath_meataxe/version_requirements.txt +++ b/build/pkgs/sagemath_meataxe/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-meataxe ~= 10.5rc1 +sagemath-meataxe ~= 10.5rc2 diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/build/pkgs/sagemath_objects/version_requirements.txt index 990a0601e08..2087671be40 100644 --- 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 sage-update-version script -sagemath-objects ~= 10.5rc1 +sagemath-objects ~= 10.5rc2 diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/build/pkgs/sagemath_repl/version_requirements.txt index 7ab5cec5f5b..cf19972eb63 100644 --- 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 sage-update-version script -sagemath-repl ~= 10.5rc1 +sagemath-repl ~= 10.5rc2 diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt index 0863567dacc..eb2af632ca7 100644 --- a/build/pkgs/sagemath_sirocco/version_requirements.txt +++ b/build/pkgs/sagemath_sirocco/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-sirocco ~= 10.5rc1 +sagemath-sirocco ~= 10.5rc2 diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt index 847534f161e..ebd9f2961a9 100644 --- a/build/pkgs/sagemath_tdlib/version_requirements.txt +++ b/build/pkgs/sagemath_tdlib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-tdlib ~= 10.5rc1 +sagemath-tdlib ~= 10.5rc2 diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sage-conf/VERSION.txt +++ b/pkgs/sage-conf/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sage-conf_conda/VERSION.txt +++ b/pkgs/sage-conf_conda/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sage-conf_pypi/VERSION.txt +++ b/pkgs/sage-conf_pypi/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sage-docbuild/VERSION.txt +++ b/pkgs/sage-docbuild/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sage-setup/VERSION.txt +++ b/pkgs/sage-setup/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sage-sws2rst/VERSION.txt +++ b/pkgs/sage-sws2rst/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-bliss/VERSION.txt +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-categories/VERSION.txt +++ b/pkgs/sagemath-categories/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-environment/VERSION.txt +++ b/pkgs/sagemath-environment/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-objects/VERSION.txt +++ b/pkgs/sagemath-objects/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-repl/VERSION.txt +++ b/pkgs/sagemath-repl/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt index d2205320557..861a196a402 100644 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/src/VERSION.txt b/src/VERSION.txt index d2205320557..861a196a402 100644 --- a/src/VERSION.txt +++ b/src/VERSION.txt @@ -1 +1 @@ -10.5.rc1 +10.5.rc2 diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index bafb8fc6368..0386f6ef5aa 100644 --- a/src/bin/sage-version.sh +++ b/src/bin/sage-version.sh @@ -4,6 +4,6 @@ # which stops "setup.py develop" from rewriting it as a Python file. : # This file is auto-generated by the sage-update-version script, do not edit! -SAGE_VERSION='10.5.rc1' -SAGE_RELEASE_DATE='2024-11-23' -SAGE_VERSION_BANNER='SageMath version 10.5.rc1, Release Date: 2024-11-23' +SAGE_VERSION='10.5.rc2' +SAGE_RELEASE_DATE='2024-11-30' +SAGE_VERSION_BANNER='SageMath version 10.5.rc2, Release Date: 2024-11-30' diff --git a/src/sage/version.py b/src/sage/version.py index eeb9eae6692..8e15dcf37c7 100644 --- a/src/sage/version.py +++ b/src/sage/version.py @@ -1,5 +1,5 @@ # Sage version information for Python scripts # This file is auto-generated by the sage-update-version script, do not edit! -version = '10.5.rc1' -date = '2024-11-23' -banner = 'SageMath version 10.5.rc1, Release Date: 2024-11-23' +version = '10.5.rc2' +date = '2024-11-30' +banner = 'SageMath version 10.5.rc2, Release Date: 2024-11-30' From d8078d3789b26211ea3c6ac579896298858a7d86 Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Sat, 30 Nov 2024 23:36:50 +0100 Subject: [PATCH 14/15] PKG_CONFIG must be empty if not found Followup to https://github.com/sagemath/sage/pull/38954, where I followed the pkgconf documentation to set PKG_CONFIG=false if it is not found. But Sage uses "test -z $PKG_CONFIG", so it must instead be set to empty. This causes pkgconf not to be built if pkgconf/pkg-config is not found. Which is basically only macOS. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1bf79ed7333..067b10c99d8 100644 --- a/configure.ac +++ b/configure.ac @@ -222,7 +222,7 @@ dnl Exit autoconf with exit code 16 in this case. This will be dnl caught by the bootstrap script. m4_exit(16)]) -PKG_PROG_PKG_CONFIG([0.29], [PKG_CONFIG=false]) +PKG_PROG_PKG_CONFIG([0.29], [PKG_CONFIG=]) AC_CHECK_PROG(found_ranlib, ranlib, yes, no) if test x$found_ranlib != xyes From 8a972c4d39ebd61b39885dde30e6b02db9015a89 Mon Sep 17 00:00:00 2001 From: Release Manager Date: Wed, 4 Dec 2024 01:08:45 +0100 Subject: [PATCH 15/15] Updated SageMath version to 10.5 --- CITATION.cff | 4 ++-- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 4 ++-- build/pkgs/configure/package-version.txt | 2 +- build/pkgs/sage_conf/version_requirements.txt | 2 +- build/pkgs/sage_docbuild/version_requirements.txt | 2 +- build/pkgs/sage_setup/version_requirements.txt | 2 +- build/pkgs/sage_sws2rst/version_requirements.txt | 2 +- build/pkgs/sagelib/version_requirements.txt | 2 +- build/pkgs/sagemath_bliss/version_requirements.txt | 2 +- build/pkgs/sagemath_categories/version_requirements.txt | 2 +- build/pkgs/sagemath_coxeter3/version_requirements.txt | 2 +- build/pkgs/sagemath_environment/version_requirements.txt | 2 +- build/pkgs/sagemath_mcqd/version_requirements.txt | 2 +- build/pkgs/sagemath_meataxe/version_requirements.txt | 2 +- build/pkgs/sagemath_objects/version_requirements.txt | 2 +- build/pkgs/sagemath_repl/version_requirements.txt | 2 +- build/pkgs/sagemath_sirocco/version_requirements.txt | 2 +- build/pkgs/sagemath_tdlib/version_requirements.txt | 2 +- pkgs/sage-conf/VERSION.txt | 2 +- pkgs/sage-conf_conda/VERSION.txt | 2 +- pkgs/sage-conf_pypi/VERSION.txt | 2 +- pkgs/sage-docbuild/VERSION.txt | 2 +- pkgs/sage-setup/VERSION.txt | 2 +- pkgs/sage-sws2rst/VERSION.txt | 2 +- pkgs/sagemath-bliss/VERSION.txt | 2 +- pkgs/sagemath-categories/VERSION.txt | 2 +- pkgs/sagemath-coxeter3/VERSION.txt | 2 +- pkgs/sagemath-environment/VERSION.txt | 2 +- pkgs/sagemath-mcqd/VERSION.txt | 2 +- pkgs/sagemath-meataxe/VERSION.txt | 2 +- pkgs/sagemath-objects/VERSION.txt | 2 +- pkgs/sagemath-repl/VERSION.txt | 2 +- pkgs/sagemath-sirocco/VERSION.txt | 2 +- pkgs/sagemath-tdlib/VERSION.txt | 2 +- src/VERSION.txt | 2 +- src/bin/sage-version.sh | 6 +++--- src/doc/en/website/versions.txt | 1 + src/sage/version.py | 6 +++--- 39 files changed, 45 insertions(+), 44 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index c0dbf3d6a37..16ab592bb9a 100644 --- 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.5.rc2 +version: 10.5 doi: 10.5281/zenodo.8042260 -date-released: 2024-11-30 +date-released: 2024-12-04 repository-code: "https://github.com/sagemath/sage" url: "https://www.sagemath.org/" diff --git a/VERSION.txt b/VERSION.txt index 219cada0e3f..e057a4fa381 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 10.5.rc2, Release Date: 2024-11-30 +SageMath version 10.5, Release Date: 2024-12-04 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 6de96c8fe48..2002501ddee 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,3 +1,3 @@ tarball=configure-VERSION.tar.gz -sha1=7d0d584233b0a52b62dba5eaeaac13d8c38652eb -sha256=02d5e5ee0fad7ccbc99ae92ecb7cfc92260962cb1c8714c6fcd2f561c3d718e6 +sha1=62eedaff4c03b55fdd6f8e1242026226adbf3a16 +sha256=54036d6435218ce1daa7d5d512e1bfd74d3713ed5745d5c49ee1f5e6122a25de diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index cde04b63e0e..c2d9070ce76 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -a60f0455273de4b2b07878d92e8357d8d9a839c8 +f6ad0ecf1f4a269f5954d5487336b13f70624594 diff --git a/build/pkgs/sage_conf/version_requirements.txt b/build/pkgs/sage_conf/version_requirements.txt index 11ae1c5d2a5..a979e585a50 100644 --- a/build/pkgs/sage_conf/version_requirements.txt +++ b/build/pkgs/sage_conf/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-conf ~= 10.5rc2 +sage-conf ~= 10.5 diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/build/pkgs/sage_docbuild/version_requirements.txt index b2dd3fbec85..e1fac619a47 100644 --- 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 sage-update-version script -sage-docbuild ~= 10.5rc2 +sage-docbuild ~= 10.5 diff --git a/build/pkgs/sage_setup/version_requirements.txt b/build/pkgs/sage_setup/version_requirements.txt index c9bffddf1dc..7eac3993c51 100644 --- 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 sage-update-version script -sage-setup ~= 10.5rc2 +sage-setup ~= 10.5 diff --git a/build/pkgs/sage_sws2rst/version_requirements.txt b/build/pkgs/sage_sws2rst/version_requirements.txt index 44d72b63d93..3116bf7335f 100644 --- a/build/pkgs/sage_sws2rst/version_requirements.txt +++ b/build/pkgs/sage_sws2rst/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-sws2rst ~= 10.5rc2 +sage-sws2rst ~= 10.5 diff --git a/build/pkgs/sagelib/version_requirements.txt b/build/pkgs/sagelib/version_requirements.txt index 49cf1f431c8..d3ff4cfaa4e 100644 --- a/build/pkgs/sagelib/version_requirements.txt +++ b/build/pkgs/sagelib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-standard ~= 10.5rc2 +sagemath-standard ~= 10.5 diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/build/pkgs/sagemath_bliss/version_requirements.txt index 97488091046..168679d2732 100644 --- a/build/pkgs/sagemath_bliss/version_requirements.txt +++ b/build/pkgs/sagemath_bliss/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-bliss ~= 10.5rc2 +sagemath-bliss ~= 10.5 diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/build/pkgs/sagemath_categories/version_requirements.txt index 38d0f576482..ce0889bf57b 100644 --- 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 sage-update-version script -sagemath-categories ~= 10.5rc2 +sagemath-categories ~= 10.5 diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt index 74fcc5180f1..3cb8ea71df9 100644 --- a/build/pkgs/sagemath_coxeter3/version_requirements.txt +++ b/build/pkgs/sagemath_coxeter3/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-coxeter3 ~= 10.5rc2 +sagemath-coxeter3 ~= 10.5 diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/build/pkgs/sagemath_environment/version_requirements.txt index 17b0f996c23..7dda12e45a9 100644 --- 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 sage-update-version script -sagemath-environment ~= 10.5rc2 +sagemath-environment ~= 10.5 diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt index e25bbd7cbf5..9e1ef4f46bb 100644 --- a/build/pkgs/sagemath_mcqd/version_requirements.txt +++ b/build/pkgs/sagemath_mcqd/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-mcqd ~= 10.5rc2 +sagemath-mcqd ~= 10.5 diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt index 839d6691290..f877d05503f 100644 --- a/build/pkgs/sagemath_meataxe/version_requirements.txt +++ b/build/pkgs/sagemath_meataxe/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-meataxe ~= 10.5rc2 +sagemath-meataxe ~= 10.5 diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/build/pkgs/sagemath_objects/version_requirements.txt index 2087671be40..55b2a515688 100644 --- 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 sage-update-version script -sagemath-objects ~= 10.5rc2 +sagemath-objects ~= 10.5 diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/build/pkgs/sagemath_repl/version_requirements.txt index cf19972eb63..3b19e791c62 100644 --- 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 sage-update-version script -sagemath-repl ~= 10.5rc2 +sagemath-repl ~= 10.5 diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt index eb2af632ca7..fb52db7e2e5 100644 --- a/build/pkgs/sagemath_sirocco/version_requirements.txt +++ b/build/pkgs/sagemath_sirocco/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-sirocco ~= 10.5rc2 +sagemath-sirocco ~= 10.5 diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt index ebd9f2961a9..61cefc36c54 100644 --- a/build/pkgs/sagemath_tdlib/version_requirements.txt +++ b/build/pkgs/sagemath_tdlib/version_requirements.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-tdlib ~= 10.5rc2 +sagemath-tdlib ~= 10.5 diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sage-conf/VERSION.txt +++ b/pkgs/sage-conf/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sage-conf_conda/VERSION.txt +++ b/pkgs/sage-conf_conda/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sage-conf_pypi/VERSION.txt +++ b/pkgs/sage-conf_pypi/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sage-docbuild/VERSION.txt +++ b/pkgs/sage-docbuild/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sage-setup/VERSION.txt +++ b/pkgs/sage-setup/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sage-sws2rst/VERSION.txt +++ b/pkgs/sage-sws2rst/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-bliss/VERSION.txt +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-categories/VERSION.txt +++ b/pkgs/sagemath-categories/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-environment/VERSION.txt +++ b/pkgs/sagemath-environment/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-objects/VERSION.txt +++ b/pkgs/sagemath-objects/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-repl/VERSION.txt +++ b/pkgs/sagemath-repl/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/src/VERSION.txt b/src/VERSION.txt index 861a196a402..9a62de225f0 100644 --- a/src/VERSION.txt +++ b/src/VERSION.txt @@ -1 +1 @@ -10.5.rc2 +10.5 diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 0386f6ef5aa..b6288bff917 100644 --- a/src/bin/sage-version.sh +++ b/src/bin/sage-version.sh @@ -4,6 +4,6 @@ # which stops "setup.py develop" from rewriting it as a Python file. : # This file is auto-generated by the sage-update-version script, do not edit! -SAGE_VERSION='10.5.rc2' -SAGE_RELEASE_DATE='2024-11-30' -SAGE_VERSION_BANNER='SageMath version 10.5.rc2, Release Date: 2024-11-30' +SAGE_VERSION='10.5' +SAGE_RELEASE_DATE='2024-12-04' +SAGE_VERSION_BANNER='SageMath version 10.5, Release Date: 2024-12-04' diff --git a/src/doc/en/website/versions.txt b/src/doc/en/website/versions.txt index 12aed2b8cfe..6d1a9aa05ea 100644 --- a/src/doc/en/website/versions.txt +++ b/src/doc/en/website/versions.txt @@ -7,6 +7,7 @@ # The sage-update-version script adds a new line for a new stable release # when run by the Sage release manager to prepare a new release # +10.5 doc-10-5--sagemath.netlify.app 10.4 doc-10-4--sagemath.netlify.app 10.3 doc-10-3--sagemath.netlify.app 10.2 doc-10-2--sagemath.netlify.app diff --git a/src/sage/version.py b/src/sage/version.py index 8e15dcf37c7..cc61dd0ca38 100644 --- a/src/sage/version.py +++ b/src/sage/version.py @@ -1,5 +1,5 @@ # Sage version information for Python scripts # This file is auto-generated by the sage-update-version script, do not edit! -version = '10.5.rc2' -date = '2024-11-30' -banner = 'SageMath version 10.5.rc2, Release Date: 2024-11-30' +version = '10.5' +date = '2024-12-04' +banner = 'SageMath version 10.5, Release Date: 2024-12-04'