sagemath · vbraun · Apr 1, 2023 · Feb 17, 2023 · Feb 17, 2023 · Feb 17, 2023
diff --git a/.codecov.yml b/.codecov.yml
@@ -0,0 +1,15 @@
+# https://docs.codecov.com/docs/pull-request-comments#disable-comment
+comment: false
+# https://docs.codecov.com/docs/commit-status
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 0%
+        base: auto
+    patch:
+      default:
+        target: auto
+        threshold: 0%
+        base: auto
diff --git a/.devcontainer/portability-Dockerfile b/.devcontainer/portability-Dockerfile
@@ -5,4 +5,4 @@ ARG SYSTEM_FACTOR="ubuntu-jammy"
 ARG PACKAGE_FACTOR="standard"
 ARG DOCKER_TARGET="with-system-packages"
 ARG DOCKER_TAG="dev"
-FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
+FROM ghcr.io/sagemath/sage/sage-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,29 +1,29 @@
-<!-- ^^^^^
-Please provide a concise, informative and self-explanatory title.
-Don't put issue numbers in there, do this in the PR body below.
-For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1"
--->
-### 📚 Description
+<!-- Please provide a concise, informative and self-explanatory title. -->
+<!-- Don't put issue numbers in the title. Put it in the Description below. -->
+<!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" -->
+
+### :books: Description
 
-<!-- Describe your changes here in detail -->
+<!-- Describe your changes here in detail. -->
 <!-- Why is this change required? What problem does it solve? -->
-<!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" -->
+<!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". -->
+<!-- If your change requires a documentation PR, please link it appropriately. -->
 
-### 📝 Checklist
+### :memo: Checklist
 
-<!-- Put an `x` in all the boxes that apply. -->
-<!-- If your change requires a documentation PR, please link it appropriately -->
-<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. -->
 
-- [ ] I have made sure that the title is self-explanatory and the description concisely explains the PR.
-- [ ] I have linked an issue or discussion.
+- [ ] The title is concise, informative, and self-explanatory.
+- [ ] The description explains in detail what this PR is about.
+- [ ] I have linked a relevant issue or discussion.
 - [ ] I have created tests covering the changes.
 - [ ] I have updated the documentation accordingly.
 
-### ⌛ Dependencies
-<!-- List all open pull requests that this PR logically depends on -->
-<!--
-- #xyz: short description why this is a dependency
-- #abc: ...
+### :hourglass: Dependencies
+
+<!-- List all open PRs that this PR logically depends on
+- #12345: short description why this is a dependency
+- #34567: ...
 -->
 
+<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -103,6 +103,6 @@ jobs:
 
       - name: Upload coverage to codecov
         if: always() && steps.build.outcome == 'success'
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           files: ./coverage.xml
diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python: [3.8, 3.9]
+        python: ['3.9', '3.10', '3.11']
         conda-env: [environment, environment-optional]
 
     steps:
@@ -41,11 +41,18 @@ jobs:
           bash ~/miniconda.sh -b -p $HOME/miniconda
           echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
 
+      # Workaround for https://github.com/actions/runner-images/issues/6910 / https://github.com/conda/conda/issues/12303
+      - name: Downgrade conda
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          conda config --set allow_conda_downgrades true
+          conda install conda=4.12.0 -y
+
       - name: Create conda environment files
         run: ./bootstrap-conda
 
       - name: Cache conda packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
           key:

diff --git a/.github/workflows/doc-build-pdf.yml b/.github/workflows/doc-build-pdf.yml
@@ -0,0 +1,51 @@
+name: Build documentation (PDF)
+
+on:
+  pull_request:
+  push:
+  workflow_dispatch:
+    # Allow to run manually
+
+concurrency:
+  # Cancel previous runs of this workflow for the same branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-docs:
+    runs-on: ubuntu-latest
+    # Use "maximal" so that texlive is installed
+    # Use "fedora-31" for build diversity
+    container: ghcr.io/sagemath/sage/sage-docker-fedora-31-maximal-with-targets:dev
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          apt-get update && apt-get install -y zip
+          # Reuse built SAGE_LOCAL contained in the Docker image
+          ./bootstrap
+          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-download-from-upstream-url
+
+      - name: Build
+        run: make build V=0 && make doc-pdf
+        env:
+          MAKE: make -j2
+          SAGE_NUM_THREADS: 2
+          TEXMFHOME: /sage/texmf
+
+      - name: Copy docs
+        run: |
+          # For some reason the deploy step below cannot find /sage/...
+          # So copy everything from there to local folder
+          mkdir -p ./docs
+          cp -r -L /sage/local/share/doc/sage/pdf/en/* ./docs
+          # Zip everything for increased performance
+          zip -r docs-pdf.zip docs
+
+      - name: Upload docs
+        uses: actions/upload-artifact@v3
+        with:
+          name: docs-pdf
+          path: docs-pdf.zip
diff --git a/.github/workflows/doc-publish.yml b/.github/workflows/doc-publish.yml
@@ -28,7 +28,7 @@ jobs:
       # Once https://github.com/actions/download-artifact/issues/172 and/or https://github.com/actions/download-artifact/issues/60 is implemented, we can use the official download-artifact action
       # For now use the solution from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
       - name: Download docs
-        uses: actions/github-script@v3.1.0
+        uses: actions/github-script@v6.4.0
         with:
           script: |
             var artifacts = await github.actions.listWorkflowRunArtifacts({

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 10.0.beta5", 
-    "version": "10.0.beta5", 
+    "title": "sagemath/sage: 10.0.beta6", 
+    "version": "10.0.beta6", 
     "upload_type": "software", 
-    "publication_date": "2023-03-19", 
+    "publication_date": "2023-03-26", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/10.0.beta5", 
+            "identifier": "https://github.com/sagemath/sage/tree/10.0.beta6", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
-<a href="https://sagemath.org"><img src="src/doc/common/themes/sage/static/logo_sagemath_black.svg" height="60" align="right" /></a>
+<a href="https://sagemath.org">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="src/doc/common/static/logo_sagemath_white.svg">
+    <img src="src/doc/common/static/logo_sagemath_black.svg" height="60" align="left">
+  </picture>
+</a>
 
 # Sage: Open Source Mathematical Software
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 10.0.beta5, Release Date: 2023-03-19
+SageMath version 10.0.beta6, Release Date: 2023-03-26
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=0ea92e19072c843aa21527e051eff0a0f97eb9ad
-md5=44e659f4d263acad8194e16952762a82
-cksum=3343113057
+sha1=c9dfa61ff70a2dceec85ad01fc37ee42232402c0
+md5=7479fb53c1b9fd56aea37f83a34cdac3
+cksum=3525422540
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-49c2cd323e638cdfb0444d72daad21b4ddbd1887
+4452928a1a41758883e2f0e3a445b015dfa0e593
diff --git a/build/pkgs/cvxpy/SPKG.rst b/build/pkgs/cvxpy/SPKG.rst
@@ -0,0 +1,18 @@
+cvxpy: A domain-specific language for modeling convex optimization problems in Python.
+======================================================================================
+
+Description
+-----------
+
+A domain-specific language for modeling convex optimization problems in Python.
+
+License
+-------
+
+Apache License, Version 2.0
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/cvxpy/
+
diff --git a/build/pkgs/cvxpy/checksums.ini b/build/pkgs/cvxpy/checksums.ini
@@ -0,0 +1,5 @@
+tarball=cvxpy-VERSION.tar.gz
+sha1=8c87f8f8c2177f917ec2fad7d2b510787ffdf72d
+md5=408b0a3140750299207f61de95b4ed6e
+cksum=3643150234
+upstream_url=https://pypi.io/packages/source/c/cvxpy/cvxpy-VERSION.tar.gz
diff --git a/build/pkgs/cvxpy/dependencies b/build/pkgs/cvxpy/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/cvxpy/distros/conda.txt b/build/pkgs/cvxpy/distros/conda.txt
@@ -0,0 +1 @@
+cvxpy
diff --git a/build/pkgs/cvxpy/install-requires.txt b/build/pkgs/cvxpy/install-requires.txt
@@ -0,0 +1 @@
+cvxpy
diff --git a/build/pkgs/cvxpy/package-version.txt b/build/pkgs/cvxpy/package-version.txt
@@ -0,0 +1 @@
+1.3.0
diff --git a/build/pkgs/cvxpy/spkg-install.in b/build/pkgs/cvxpy/spkg-install.in
@@ -0,0 +1,3 @@
+cd src
+# --no-build-isolation to ignore the numpy version pin in pyproject.toml
+sdh_pip_install --no-build-isolation .
diff --git a/build/pkgs/cvxpy/type b/build/pkgs/cvxpy/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/cylp/SPKG.rst b/build/pkgs/cylp/SPKG.rst
@@ -9,7 +9,11 @@ A Python interface for CLP, CBC, and CGL
 License
 -------
 
-Eclipse Public License
+Eclipse Public License (EPL) version 2 (without a Secondary Licenses Notice).
+
+Note: This license is incompatible with the GPL according to
+https://www.gnu.org/licenses/license-list.html#EPL2;
+see also the discussion in :trac:`26511`.
 
 Upstream Contact
 ----------------

diff --git a/build/pkgs/cylp/checksums.ini b/build/pkgs/cylp/checksums.ini
@@ -1,5 +1,5 @@
 tarball=cylp-VERSION.tar.gz
-sha1=54965f2ae9b914df7817dffd53bc34925a6fadd4
-md5=a4f50e6b24a7fcd2e890a9e7e8825437
-cksum=4132703858
+sha1=1c2d20933abc48ed2fefc1ae45d8f9492fc2eef2
+md5=ac0308a916dac5dd84f831dbc0fba5c5
+cksum=1532166313
 upstream_url=https://pypi.io/packages/source/c/cylp/cylp-VERSION.tar.gz
diff --git a/build/pkgs/cylp/package-version.txt b/build/pkgs/cylp/package-version.txt
@@ -1 +1 @@
-0.91.4
+0.91.5