Merge branch 'develop' into hide_features_34185

Author: soehms

.github/workflows/build.yml

@@ -3,6 +3,9 @@ name: Build & Test
 on:
   pull_request:
   push:
+    branches: ['**']
+    # Ignore pushes on tags to prevent two uploads of codecov reports
+    tags-ignore: ['**']
   workflow_dispatch:
     # Allow to run manually
     inputs:
@@ -91,7 +94,7 @@ jobs:
         if: always() && steps.build.outcome == 'success'
         run: |
           ../sage -python -m pip install coverage
-          ../sage -python -m coverage run ./bin/sage-runtests --all -p2
+          ../sage -python -m coverage run ./bin/sage-runtests --all -p2 --random-seed=286735480429121101562228604801325644303
         working-directory: ./src
 
       - name: Prepare coverage results

.vscode/settings.json

@@ -27,7 +27,7 @@
     "python.linting.enabled": true,
     // The following pycodestyle arguments are the same as the pycodestyle-minimal
     // tox environnment, see the file SAGE_ROOT/src/tox.ini
-    "python.linting.pycodestyleArgs": ["--select=E111,E306,E401,E701,E702,E703,W291,W391,W605,E711,E712,E713,E721,E722"],
+    "python.linting.pycodestyleArgs": ["--select= E111,E211,E271,E303,E306,E401,E502,E701,E702,E703,E714,W291,W293,W391,W605,E711,E712,E713,E721,E722"],
     "cSpell.words": [
         "furo",
         "Conda",

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 10.1.beta0", 
-    "version": "10.1.beta0", 
+    "title": "sagemath/sage: 10.1.beta1", 
+    "version": "10.1.beta1", 
     "upload_type": "software", 
-    "publication_date": "2023-05-22", 
+    "publication_date": "2023-05-28", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/10.1.beta0", 
+            "identifier": "https://github.com/sagemath/sage/tree/10.1.beta1", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.1.beta0, Release Date: 2023-05-22
+SageMath version 10.1.beta1, Release Date: 2023-05-28

bootstrap-conda

@@ -17,7 +17,7 @@ OPTIONAL_SYSTEM_PACKAGES=
 SAGELIB_SYSTEM_PACKAGES=
 SAGELIB_OPTIONAL_SYSTEM_PACKAGES=
 DEVELOP_SYSTEM_PACKAGES=
-for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
+for PKG_BASE in $(sage-package list --has-file distros/conda.txt --exclude _sagemath); do
     PKG_SCRIPTS=build/pkgs/$PKG_BASE
     SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/conda.txt
     PKG_TYPE=$(cat $PKG_SCRIPTS/type)

build/pkgs/_bootstrap/distros/conda.txt

@@ -1,2 +1,5 @@
 # Packages needed for ./bootstrap
-autoconf automake libtool
+autoconf
+automake
+libtool
+pkg-config

build/pkgs/_bootstrap/distros/slackware.txt

@@ -2,3 +2,4 @@
 autoconf
 automake
 libtool
+pkg-config

build/pkgs/_bootstrap/distros/void.txt

@@ -1,3 +1,4 @@
 # Packages needed for ./bootstrap
 autoconf automake libtool
 xtools mk-configure
+pkg-config

build/pkgs/_prereq/distros/conda.txt

@@ -5,4 +5,3 @@ perl
 python
 tar
 bc
-pkg-config

build/pkgs/_prereq/distros/slackware.txt

@@ -14,6 +14,5 @@ python3          # on slackware-current
 flex
 # for https upstream_url downloads
 ca-certificates
-pkg-config
 libxml2
 cyrus-sasl