Merge remote-tracking branch 'upstream/develop' into more-integer-avoid-mutate

Author: user202729

.devcontainer/onCreate-meson.sh

@@ -2,7 +2,7 @@
 
 SYSTEM=$(build/bin/sage-guess-package-system)
 
-if [ "$SYSTEM" = "fedora" ]; then
+if [ "$SYSTEM" = "fedora" ] && [ -f /etc/fedora-release ]; then
     # Need to use --setopt=tsflags="" to avoid errors with gphelp
     dnf5 install -y pari-gp --setopt=tsflags=""
 
@@ -16,7 +16,8 @@ eval $(build/bin/sage-print-system-package-command $SYSTEM --yes --ignore-missin
 
 # Disable build isolation following the advice of https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
 # Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
-uv venv
+uv venv --clear
+. $UV_PROJECT_ENVIRONMENT/bin/activate # https://github.com/astral-sh/uv/issues/14022
 uv pip install \
     meson-python \
     "cypari2 >=2.2.1" \
@@ -27,4 +28,4 @@ uv pip install \
     "numpy >=1.25" \
     jinja2 \
     setuptools
-uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM
+uv sync --frozen --inexact --no-build-isolation -v --config-settings=builddir=build/build-$SYSTEM-$devcontainerId

.devcontainer/portability-archlinux/devcontainer.json

@@ -13,6 +13,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-fedora-41/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-fedora-42/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-ubuntu-2204/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-ubuntu-2404/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-ubuntu-2504/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-void/devcontainer.json

@@ -14,6 +14,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.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/[email protected]