Merge remote-tracking branch 'origin/public/build/conda-dev-env' into…

… public/build/conda_gitpod
sagemath · May 9, 2022 · 82fe6a6 · 82fe6a6
2 parents bd2f3d3 + 87f360c
commit 82fe6a6
Show file tree

Hide file tree

Showing 68 changed files with 655 additions and 414 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,10 +31,9 @@ jobs:
         run: |
           # Reuse built SAGE_LOCAL contained in the Docker image 
           ./bootstrap
-          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable
+          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
           # Install test tools
           apt-get install -y git
-          ./sage -python -m pip install coverage
       
       - name: Static code check with pyright
         run: pyright    
@@ -46,7 +45,9 @@ jobs:
           SAGE_NUM_THREADS: 2
 
       - name: Test
-        run: ../sage -python -m coverage run ./bin/sage-runtests --all -p2
+        run: |
+          ../sage -python -m pip install coverage
+          ../sage -python -m coverage run ./bin/sage-runtests --all -p2
         working-directory: ./src
 
       - name: Prepare coverage results

diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -43,15 +43,8 @@ jobs:
           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: Create conda environment files
+        run: ./bootstrap-conda
 
       - name: Cache conda packages
         uses: actions/cache@v2
@@ -80,6 +73,7 @@ jobs:
         shell: bash -l {0}
         continue-on-error: true
         run: |
+          ./bootstrap
           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::"
@@ -88,8 +82,8 @@ jobs:
       - 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
+          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
 

diff --git a/.github/workflows/ci-cygwin-minimal.yml b/.github/workflows/ci-cygwin-minimal.yml
@@ -43,7 +43,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -103,7 +103,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -168,7 +168,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -238,7 +238,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -306,7 +306,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -374,7 +374,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -442,7 +442,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -514,7 +514,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -586,7 +586,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -658,7 +658,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -728,7 +728,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -796,7 +796,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -864,7 +864,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -932,7 +932,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -1000,7 +1000,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml
@@ -43,7 +43,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -103,7 +103,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -168,7 +168,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -238,7 +238,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -306,7 +306,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -374,7 +374,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -442,7 +442,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -514,7 +514,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -586,7 +586,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -658,7 +658,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -728,7 +728,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -796,7 +796,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -864,7 +864,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -932,7 +932,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -1000,7 +1000,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
@@ -23,7 +23,7 @@ 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-download-from-upstream-url
 
       - name: Build
         run: make doc-html

diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@
 /environment.yml
 /environment-optional.yml
 /src/environment.yml
+/src/environment-dev.yml
 /src/environment-optional.yml
 
 /src/setup.cfg

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -21,4 +21,8 @@
     "python.testing.unittestEnabled": false,
     "python.linting.pycodestyleEnabled": true,
     "python.linting.enabled": true,
+    "cSpell.words": [
+        "Conda",
+        "Cython"
+    ],
 }
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: 9.6.rc0", 
-    "version": "9.6.rc0", 
+    "title": "sagemath/sage: 9.6.rc2", 
+    "version": "9.6.rc2", 
     "upload_type": "software", 
-    "publication_date": "2022-04-10", 
+    "publication_date": "2022-04-25", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.6.rc0", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.6.rc2", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/Makefile b/Makefile
@@ -171,6 +171,7 @@ bootstrap-clean:
 	rm -f src/doc/en/reference/repl/*.txt
 	rm -f environment.yml
 	rm -f src/environment.yml
+	rm -f src/environment-dev.yml
 	rm -f environment-optional.yml
 	rm -f src/environment-optional.yml
 	rm -f src/Pipfile