Rebaseandfixfor40882

.github/sync_labels.py

@@ -408,7 +408,17 @@ def get_commits(self):
             return self._commits
 
         self._commits = self.view('commits')
-        self._commit_date = max( com['committedDate'] for com in self._commits )
+
+        # ignore merge commits with the develop branch for _commit_date unless positive review is set
+        date_commits = list(self._commits)
+        if Status.positive_review.value not in self.get_labels():
+            for com in self._commits:
+                message =  com['messageHeadline']
+                if message.startswith('Merge') and 'develop' in message:
+                    debug('Ignore merge commit %s for commit_date' % com['oid'])
+                    date_commits.remove(com)
+
+        self._commit_date = max(com['committedDate'] for com in date_commits)
         info('Commits until %s for %s: %s' % (self._commit_date, self._issue, self._commits))
         return self._commits
 
@@ -1034,6 +1044,35 @@ def run_tests(self):
             elif self.is_pull_request():
                 self.run(action)
 
+    def test_method(self, method, *args, **kwds):
+        r"""
+        Run the given method for testing.
+
+        EXAMPLES::
+
+            sage$ python .github/sync_labels.py https://github.com/sagemath/sage/pull/40634 soehms is_auth_team_member "{'login': 'soehms'}" -t
+            INFO:root:cmdline_args (4) ['https://github.com/sagemath/sage/pull/40634', 'soehms', 'is_auth_team_member', "{'login': 'soehms'}"]
+            ...
+            DEBUG:root:call is_auth_team_member with args () and kwds {'login': 'soehms'}
+            DEBUG:root:================================================================================
+            DEBUG:root:Execute command: gh api -X GET -H "Accept: application/vnd.github+json" /orgs/sagemath/teams/triage/memberships/soehms
+            INFO:root:User soehms is a member of triage
+            INFO:root:result of is_auth_team_member with args () and kwds {'login': 'soehms'} is True
+            INFO:root:================================================================================
+            ...
+        """
+        if hasattr(self, method):
+            meth = self.__getattribute__(method)
+            if callable(meth):
+                debug('call %s with args %s and kwds %s' % (method, args, kwds))
+                debug('='*80)
+                res = meth(*args, **kwds)
+                info('result of %s with args %s and kwds %s is %s' % (method, args, kwds, res))
+                info('='*80)
+                debug('state of self: %s' % self.__dict__)
+                return
+        raise ValueError('%s is not a method of %s' % (method, self))
+
 
 ###############################################################################
 # Main
@@ -1068,8 +1107,10 @@ def run_tests(self):
 num_args = len(cmdline_args)
 info('cmdline_args (%s) %s' % (num_args, cmdline_args))
 
-if run_tests and num_args in (1,2):
-    if num_args == 2:
+if run_tests:
+    if num_args == 4:
+        url, actor, method, args = cmdline_args
+    elif num_args == 2:
         url, actor = cmdline_args
     else:
         url, = cmdline_args
@@ -1079,7 +1120,10 @@ def run_tests(self):
     info('actor: %s' % actor)
 
     gh = GhLabelSynchronizer(url, actor)
-    gh.run_tests()
+    if num_args == 4:
+        gh.test_method(method, **eval(args))
+    else:
+        gh.run_tests()
 
 elif num_args == 5:
     action, url, actor, label, rev_state = cmdline_args

.github/workflows/ci-meson.yml

@@ -21,6 +21,8 @@ jobs:
   test:
     name: Conda (${{ matrix.os }}, Python ${{ matrix.python }}, ${{ matrix.tests }}${{ matrix.editable && ', editable' || '' }})
     runs-on: ${{ matrix.os }}-latest
+    env:
+      SEPARATELY_TESTED_FLAKY_FILES: "src/sage/libs/singular/function.pyx src/sage/rings/polynomial/plural.pyx"
 
     strategy:
       fail-fast: false
@@ -168,9 +170,22 @@ jobs:
             pytest --doctest-ignore-import-errors --doctest -rfEs -s src || true
           else
             pytest -rfEs -s src
-            ./sage -t ${{ matrix.tests == 'all' && '--all' || '--new --long' }} -p4 --format github
+            ./sage -t ${{
+              matrix.tests == 'all' &&
+              '--all-except="$SEPARATELY_TESTED_FLAKY_FILES"' ||
+              '--new --long' }} -p4 --format github
           fi
 
+      - name: Test flaky files
+        # unknown issues with plural.pyx causes sporadic failure: https://github.com/sagemath/sage/issues/29528
+        # we rerun a few times, this step succeeds if any of the 5 runs succeed
+        if: runner.os != 'windows' && matrix.tests == 'all'
+        shell: bash -l {0}
+        run: |
+          for i in {1..5}; do
+            ./sage -t -p4 --format github $SEPARATELY_TESTED_FLAKY_FILES && break
+          done
+
       - name: Check that all modules can be imported
         shell: bash -l {0}
         run: |
@@ -179,7 +194,11 @@ jobs:
           # The following command checks that all modules can be imported.
           # The output also includes a long list of modules together with the number of tests in each module.
           # This can be ignored.
-          pytest -qq --doctest --collect-only || true
+          if [[ "${{ matrix.os }}" == "windows" ]]; then
+            pytest -qq --doctest --collect-only || true
+          else
+            pytest -qq --doctest --collect-only
+          fi
 
       - name: Upload log
         uses: actions/upload-artifact@v4.5.0

.github/workflows/dist.yml

@@ -133,14 +133,32 @@ jobs:
           name: dist
           path: dist
 
-      - name: Create release assets
+      - name: Create release notes
+        env:
+          GITHUB_PAT: ${{ secrets.RELEASE_CREATION_TOKEN }}
+        run: |
+          latest_release_tag=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases \
+          | jq -r 'sort_by(.created_at) | last(.[]).tag_name')
+          release_notes=$(curl -s \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $GITHUB_PAT" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/releases/generate-notes \
+            -d "{
+              \"tag_name\": \"${{ github.ref_name }}\",
+              \"previous_tag_name\": \"$latest_release_tag\"
+            }" | jq -r '.body')
+          echo "$release_notes" > release_notes
+
+      - name: Create release
         uses: softprops/action-gh-release@v2
         with:
           files: |
             dist/*
             upstream/*
           token: ${{ secrets.RELEASE_CREATION_TOKEN }}
-          generate_release_notes: true
+          body_path: release_notes
           prerelease: ${{ contains(github.ref_name, 'beta') || contains(github.ref_name, 'rc') }}
 
   build_wheels:

.github/workflows/pyright.yml

@@ -49,7 +49,7 @@ jobs:
         # No need to build sagelib; pyright only needs the libraries from which sagelib imports
 
       - name: Static code check with pyright
-        uses: jakebailey/pyright-action@v2.3.2
+        uses: jakebailey/pyright-action@v2.3.3
         with:
           version: 1.1.332
           annotate: "errors"

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.8.beta4
+version: 10.8.beta5
 doi: 10.5281/zenodo.8042260
-date-released: 2025-09-21
+date-released: 2025-09-27
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-10.8.beta4
+10.8.beta5

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=5d512119d3ad3e0a3fefa64f26674c25529d241d
-sha256=42aa2aed7c199ada325f80a64ad4c3626378b84bb19519e68b024a617ca79ca6
+sha1=b36924b2391937313f3b2037eb1ffa4e3a9b2d81
+sha256=ec9a7a235593430352081443b1089403452ec349a202b2ca5cd73ceb63bbe26c

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-9c1da99ac79711edccbad5590ed73d14495a0b43
+0ef31d1493e6873bbdb7e14f91c57275ba3b20ee

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.8b3
+sage-docbuild ~= 10.8b4

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.8b3
+sage-setup ~= 10.8b4

build/pkgs/sagemath_bliss/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-bliss ~= 10.8b3
+sagemath-bliss ~= 10.8b4

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.8b3
+sagemath-categories ~= 10.8b4

build/pkgs/sagemath_coxeter3/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-coxeter3 ~= 10.8b3
+sagemath-coxeter3 ~= 10.8b4

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.8b3
+sagemath-environment ~= 10.8b4

build/pkgs/sagemath_mcqd/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-mcqd ~= 10.8b3
+sagemath-mcqd ~= 10.8b4

build/pkgs/sagemath_meataxe/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-meataxe ~= 10.8b3
+sagemath-meataxe ~= 10.8b4

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.8b3
+sagemath-objects ~= 10.8b4

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.8b3
+sagemath-repl ~= 10.8b4

build/pkgs/sagemath_sirocco/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-sirocco ~= 10.8b3
+sagemath-sirocco ~= 10.8b4

build/pkgs/sagemath_tdlib/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-tdlib ~= 10.8b3
+sagemath-tdlib ~= 10.8b4

configure.ac

@@ -490,14 +490,6 @@ AS_IF([test "x$enable_download_from_upstream_url" = "xyes"], [
 ])
 AC_SUBST([SAGE_SPKG_OPTIONS])
 
-AC_ARG_ENABLE([sage_conf],
-  AS_HELP_STRING([--disable-sage_conf],
-                 [disable build of the sage_conf package]), [
-    for pkg in sage_conf; do
-      AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
-    done
-  ])
-
 AC_ARG_ENABLE([cvxopt],
   AS_HELP_STRING([--disable-cvxopt],
                  [disable build of the cvxopt package and its prerequisite suitesparse]), [

conftest.py

@@ -35,6 +35,17 @@
     from pathlib import Path
 
 
+def is_subpath(path: Path, parent: Path) -> bool:
+    # Check if the path is in a subdirectory, or a subsubdirectory, ... of the parent
+    path = path.resolve()
+    parent = parent.resolve()
+    try:
+        path.relative_to(parent)
+        return True
+    except ValueError:
+        return False
+
+
 class SageDoctestModule(DoctestModule):
     """
     This is essentially a copy of `DoctestModule` from
@@ -111,9 +122,10 @@ def _find(
                             "valgrind",
                             "rpy2",
                             "sage.libs.coxeter3.coxeter",
+                            "sagemath_giac",
                         ):
                             pytest.skip(
-                                f"unable to import module { self.path } due to missing feature { exception.name }"
+                                f"unable to import module {self.path} due to missing feature {exception.name}"
                             )
                     raise
         # Uses internal doctest module parsing mechanism.
@@ -135,12 +147,12 @@ def _find(
                     )
         except FeatureNotPresentError as exception:
             pytest.skip(
-                f"unable to import module { self.path } due to missing feature { exception.feature.name }"
+                f"unable to import module {self.path} due to missing feature {exception.feature.name}"
             )
         except ModuleNotFoundError as exception:
             # TODO: Remove this once all optional things are using Features
             pytest.skip(
-                f"unable to import module { self.path } due to missing module { exception.name }"
+                f"unable to import module {self.path} due to missing module {exception.name}"
             )
 
 
@@ -256,6 +268,28 @@ def pytest_collect_file(
             return SageDoctestModule.from_parent(parent, path=file_path)
 
 
+def pytest_ignore_collect(
+    collection_path: Path, path: str, config: pytest.Config
+) -> None | bool:
+    """
+    This hook is called when collecting test files, and can be used to
+    prevent considering this path for collection by returning ``True``.
+
+    See `pytest documentation <https://docs.pytest.org/en/latest/reference/reference.html#pytest.hookspec.pytest_ignore_collect>`_.
+    """
+    root = config.rootpath
+    if (
+        is_subpath(collection_path, root / "src" / "sage_docbuild")
+        or is_subpath(collection_path, root / "src" / "sage_setup")
+        or collection_path == root / "src" / "build-docs.py"
+    ):
+        # Fails to import with Meson
+        return True
+    if collection_path.name == "all.py":
+        # all.py do not contain tests and may fail when imported twice / in the wrong order
+        return True
+
+
 def pytest_addoption(parser):
     # Add a command line option to run doctests
     # (we don't use the built-in --doctest-modules option because then doctests are collected twice)

constraints_pkgs.txt

@@ -22,7 +22,6 @@
 # Reference on the format:
 # https://pip.pypa.io/en/stable/user_guide/#constraints-files
 #
-sage_conf            @ file://${SAGE_ROOT}/pkgs/sage-conf
 sage_docbuild        @ file://${SAGE_ROOT}/pkgs/sage-docbuild
 sage_setup           @ file://${SAGE_ROOT}/pkgs/sage-setup
 sagemath-bliss       @ file://${SAGE_ROOT}/pkgs/sagemath-bliss