Merge branch 'develop' into public/coercion/special_hyperelliptic_quo…

…tient_ring-33576

.github/workflows/build.yml

@@ -18,6 +18,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Set up node to install pyright
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12'
+
+      - name: Install pyright
+        run: npm install -g pyright
+
       - name: Prepare
         run: |
           # Reuse built SAGE_LOCAL contained in the Docker image 
@@ -27,6 +35,9 @@ jobs:
           apt-get install -y git
           ./sage -python -m pip install coverage
       
+      - name: Static code check with pyright
+        run: pyright    
+
       - name: Build
         run: make build
         env:

.github/workflows/ci-conda.yml

@@ -0,0 +1,107 @@
+name: Build & Test using Conda
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+  push:
+    tags:
+      - '*'
+    branches:
+      - 'public/build/**-runci'
+  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:
+  test:
+    name: Conda
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python: [3.8, 3.9]
+        conda-env: [environment, environment-optional]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Check for Miniconda
+        id: check_conda
+        run: echo ::set-output name=installed::$CONDA
+
+      # Miniconda is installed by default in the ubuntu-latest, however not in the act-image to run it locally
+      - name: Install Miniconda
+        if: steps.check_conda.outputs.installed == ''
+        run: |
+          wget https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh -O ~/miniconda.sh
+          bash ~/miniconda.sh -b -p $HOME/miniconda
+          echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
+
+      - name: Install bootstrap prerequisites
+        run: |
+          export PATH="$(pwd)/build/bin:$PATH"
+          SYSTEM=$(sage-guess-package-system)
+          eval $(sage-print-system-package-command $SYSTEM --sudo install $(sage-get-system-packages $SYSTEM _bootstrap))
+
+      # Create conda environment file
+      - name: Bootstrap
+        run: ./bootstrap
+
+      - name: Cache conda packages
+        uses: actions/cache@v2
+        with:
+          path: ~/conda_pkgs_dir
+          key:
+            ${{ runner.os }}-conda-${{ hashFiles('src/environment.yml') }}
+
+      - name: Setup Conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          python-version: ${{ matrix.python }}
+          mamba-version: "*"
+          channels: conda-forge,defaults
+          channel-priority: true
+          activate-environment: sage-build
+          environment-file: src/${{ matrix.conda-env }}.yml
+
+      - name: Print Conda environment
+        shell: bash -l {0}
+        run: |
+          conda info
+          conda list
+
+      - name: Configure
+        shell: bash -l {0}
+        continue-on-error: true
+        run: |
+          echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
+          ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)
+          echo "::remove-matcher owner=configure-system-package-warning::"
+          echo "::remove-matcher owner=configure-system-package-error::"
+
+      - name: Build
+        shell: bash -l {0}
+        run: |
+          pip install --no-build-isolation -v -v -e pkgs/sage-conf pkgs/sage-setup 
+          pip install --no-build-isolation -v -v -e src
+        env:
+          SAGE_NUM_THREADS: 2
+
+      - name: Test
+        shell: bash -l {0}
+        run: ./sage -t --all -p0
+
+      - name: Print logs
+        run: |
+          for file in $(find . -type f -name "*.log"); do
+              echo "::group::$file"
+              cat "$file"
+              echo "::endgroup::"
+          done
+        if: always()

.github/workflows/configure-systempackage-problem-matcher.json

@@ -0,0 +1,27 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "configure-system-package-warning",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "((\\S*)\\:(\\s*)(no suitable system package; standard, will be installed as an SPKG))",
+                    "file": 2,
+                    "message": 1,
+                    "kind": "file"
+                }
+            ]
+        },
+        {
+            "owner": "configure-system-package-error",
+            "pattern": [
+                {
+                    "regexp": "((\\S*)\\:(\\s*)(no suitable system package; this is an error))",
+                    "file": 2,
+                    "message": 1,
+                    "kind": "file"
+                }
+            ]
+        }
+    ]
+}

.zenodo.json

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

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.6.beta5, Release Date: 2022-03-12
+SageMath version 9.6.beta6, Release Date: 2022-03-27

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=77a0ccf3c86269794e27c972ccc06d456d519d0b
-md5=ed8dddf6a1e934b4c6e261d3c1789023
-cksum=2861204287
+sha1=a0eb0004d52bcf6279753f7afc196124f41a2aec
+md5=f23c9203da185c3f6e436dd7e99b45e5
+cksum=1232840594

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-4eea45940133fa4c8b0ec028495db0aa5ae767ba
+f43e375fb59b4b297a3b2b4c3da31f0d4d34adb3

build/pkgs/cylp/SPKG.rst

@@ -0,0 +1,18 @@
+cylp: A Python interface for CLP, CBC, and CGL
+==============================================
+
+Description
+-----------
+
+A Python interface for CLP, CBC, and CGL
+
+License
+-------
+
+Eclipse Public License
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/cylp/
+

build/pkgs/cylp/checksums.ini

@@ -0,0 +1,5 @@
+tarball=cylp-VERSION.tar.gz
+sha1=54965f2ae9b914df7817dffd53bc34925a6fadd4
+md5=a4f50e6b24a7fcd2e890a9e7e8825437
+cksum=4132703858
+upstream_url=https://pypi.io/packages/source/c/cylp/cylp-VERSION.tar.gz

build/pkgs/cylp/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) numpy scipy cbc | $(PYTHON_TOOLCHAIN) cython
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/cylp/install-requires.txt

@@ -0,0 +1 @@
+cylp

build/pkgs/cylp/package-version.txt

@@ -0,0 +1 @@
+0.91.4