Merge tag '9.6.beta4' into t/32609/remove_more_unnecessary_uses_of_sr_and_symbolic_functions_in_sage_combinat

SageMath version 9.6.beta4, Release Date: 2022-03-08

Author: Matthias Koeppe

.github/workflows/build.yml

@@ -22,7 +22,10 @@ jobs:
         run: |
           # Reuse built SAGE_LOCAL contained in the Docker image 
           ./bootstrap
-          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv
+          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable
+          # Install test tools
+          apt-get install -y git
+          ./sage -python -m pip install coverage
       
       - name: Build
         run: make build
@@ -31,4 +34,18 @@ jobs:
           SAGE_NUM_THREADS: 2
 
       - name: Test
-        run: ./sage -t --all -p0
+        run: ../sage -python -m coverage run ./bin/sage-runtests --all -p2
+        working-directory: ./src
+
+      - name: Prepare coverage results
+        if: always()
+        run: |
+          ./venv/bin/python3 -m coverage combine src/.coverage/
+          ./venv/bin/python3 -m coverage xml
+          find . -name *coverage*
+      
+      - name: Upload coverage to codecov
+        if: always()
+        uses: codecov/codecov-action@v2
+        with:
+          files: ./coverage.xml

.github/workflows/ci-cygwin-minimal.yml

@@ -217,7 +217,7 @@ jobs:
     env:
       STAGE: ii-b
       PREVIOUS_STAGES: i-*
-      TARGETS: singular maxima gap pari gfan palp flintqs ratpoints arb ecm givaro
+      TARGETS: singular maxima gap pari gfan palp flintqs arb ecm givaro
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
 

.github/workflows/ci-cygwin-standard.yml

@@ -217,7 +217,7 @@ jobs:
     env:
       STAGE: ii-b
       PREVIOUS_STAGES: i-*
-      TARGETS: singular maxima gap pari gfan palp flintqs ratpoints arb ecm givaro
+      TARGETS: singular maxima gap pari gfan palp flintqs arb ecm givaro
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
 

.github/workflows/lint.yml

@@ -2,6 +2,11 @@ name: Lint
 
 on: [push, pull_request]
 
+concurrency:
+  # Cancel previous runs of this workflow for the same branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint-pycodestyle:
     name: Code style check with pycodestyle

.gitignore

@@ -213,6 +213,9 @@ src/venv.bak/
 **/.tox
 /prefix
 
+# code coverage generated files
+src/.coverage/
+
 # git worktree
 worktree*
 **/worktree*

.vscode/settings.json

@@ -1,16 +1,22 @@
 {
-    "python.defaultInterpreterPath": "./venv/bin/python",
-    "python.pythonPath": "./venv/bin/python",
+    "python.defaultInterpreterPath": "./venv/bin/python3",
     "files.exclude": {
         "**/__pycache__": true,
         "src/**/*.cpp": true,
         "src/**/*.so": true,
-        "build/pkgs/sagelib/src": true
+    },
+    "search.exclude": {
+        "build/pkgs/sagemath_categories/src": true,
+        "build/pkgs/sagemath_objects/src": true,
+        "build/pkgs/sagelib/src": true,
+        "pkgs/sage-conf_pypi/sage_root/build": true,
+        "pkgs/sagemath-categories/sage": true,
+        "pkgs/sagemath-objects/sage": true,
+        "pkgs/sagemath-standard/sage": true,
     },
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [
         "src"
     ],
-    "python.testing.nosetestsEnabled": false,
     "python.testing.unittestEnabled": false,
 }

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.6.beta3", 
-    "version": "9.6.beta3", 
+    "title": "sagemath/sage: 9.6.beta4", 
+    "version": "9.6.beta4", 
     "upload_type": "software", 
-    "publication_date": "2022-02-27", 
+    "publication_date": "2022-03-08", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.6.beta3", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.6.beta4", 
             "relation": "isSupplementTo"
         }, 
         {

COPYING.txt

@@ -107,7 +107,6 @@ pynac                       GPLv2+
 pyparsing                   MIT License
 python                      Python License (see below)
 R                           GPLv2+
-ratpoints                   GPLv2+
 readline                    GPLv3+
 rpy                         GPLv2+
 rubiks/dietz                GPL, any version

Makefile

@@ -194,7 +194,6 @@ micro_release:
 	@echo "Removing documentation. Inspection in IPython still works."
 	rm -rf local/share/doc local/share/*/doc local/share/*/examples local/share/singular/html
 	@echo "Removing unnecessary files & directories - make will not be functional afterwards anymore"
-	@# We need src/doc/common, src/doc/en/introspect for introspection with "??"
 	@# We keep src/sage for some doctests that it expect it to be there and
 	@# also because it does not add any weight with rdfind below.
 	@# We need src/sage/bin/ for the scripts that invoke Sage
@@ -203,7 +202,7 @@ micro_release:
 	@# We keep VERSION.txt.
 	@# We keep COPYING.txt so we ship a license with this distribution.
 	find . -name . -o -prune ! -name config.status ! -name src ! -name sage ! -name local ! -name VERSION.txt ! -name COPYING.txt ! -name build -exec rm -rf \{\} \;
-	cd src && find . -name . -o -prune ! -name sage ! -name bin ! -name doc -exec rm -rf \{\} \;
+	cd src && find . -name . -o -prune ! -name sage ! -name bin -exec rm -rf \{\} \;
 	if command -v rdfind > /dev/null; then \
 		echo "Hardlinking identical files."; \
 		rdfind -makeresultsfile false -makehardlinks true .; \

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.6.beta3, Release Date: 2022-02-27
+SageMath version 9.6.beta4, Release Date: 2022-03-08