Merge branch 'conda-lock-rename-macos' into HEAD

mkoeppe · May 20, 2024 · e254849 · e254849
2 parents f886069 + 7f3f541
commit e254849
Show file tree

Hide file tree

Showing 55 changed files with 12,044 additions and 12,101 deletions.
diff --git a/.github/workflows/ci-conda-known-test-failures.json b/.github/workflows/ci-conda-known-test-failures.json
@@ -8,15 +8,24 @@
     "sage.algebras.fusion_rings.fusion_ring": {
         "failed": "unreported random timeouts"
     },
+    "sage.categories.simplicial_sets": {
+        "failed": "failure (from GAP 4.13?) seen in https://github.com/sagemath/sage/actions/runs/9066914632/job/24910883869?pr=37998#step:10:8066"
+    },
     "sage.combinat.cluster_algebra_quiver.quiver": {
         "failed": "failure seen in https://github.com/sagemath/sage/actions/runs/6836592771/job/18591690058#step:11:10059"
     },
     "sage.geometry.cone": {
         "failed": "unreported random timeouts seen in https://github.com/sagemath/sage/actions/runs/6827937663/job/18571052628#step:11:12362"
     },
+    "sage.groups.finitely_presented": {
+        "failed": "failure (from GAP 4.13?) seen in https://github.com/sagemath/sage/actions/runs/9066914632/job/24910883869?pr=37998#step:10:4558"
+    },
     "sage.groups.matrix_gps.finitely_generated_gap": {
         "failed": true
     },
+    "sage.groups.perm_gps.permgroup_named": {
+        "failed": "failure (from GAP 4.13?) seen in https://github.com/sagemath/sage/actions/runs/9066914632/job/24910883869?pr=37998#step:10:4812"
+    },
     "sage.interfaces.expect": {
         "failed": true
     },
@@ -53,6 +62,12 @@
     "sage.rings.function_field.drinfeld_modules.morphism": {
         "failed": "unreported random failure seen in https://github.com/sagemath/sage/actions/runs/6840502530/job/18599835766#step:11:10107"
     },
+    "sage.rings.number_field.galois_group": {
+        "failed": "unreported failure (sort order) in GaloisGroup_v2.artin_symbol, https://github.com/sagemath/sage/actions/runs/9066914632/job/24910883869?pr=37998#step:10:7896"
+    },
+    "sage.rings.number_field.number_field": {
+        "failed": "unreported failure (sort order) in NumberField_absolute.[optimized_]subfields, https://github.com/sagemath/sage/actions/runs/9066914632/job/24910883869?pr=37998#step:10:7937"
+    },
     "sage.rings.polynomial.multi_polynomial_ideal": {
         "failed": true
     },
@@ -65,6 +80,9 @@
     "sage.rings.polynomial.skew_polynomial_finite_field": {
         "failed": true
     },
+    "sage.rings.qqbar": {
+        "failed": "unreported failure seen in https://github.com/sagemath/sage/actions/runs/9066914632/job/24910883869?pr=37998#step:10:8581"
+    },
     "sage.schemes.elliptic_curves.descent_two_isogeny": {
         "failed": "random segfault (macOS) https://github.com/sagemath/sage/issues/36949"
     },

diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -18,15 +18,16 @@ concurrency:
 jobs:
   test:
     name: Conda
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         # On pushes to tags or branches, test the whole matrix.
         os: >-
           ${{ github.event_name == 'pull_request'
-                && fromJson('["ubuntu"]')
-                || fromJson('["ubuntu", "macos"]') }}
+                && fromJson('["ubuntu-latest"]')
+                || fromJson('["ubuntu-latest", "macos-latest", "macos-13"]') }}
         python: >-
           ${{ github.event_name == 'pull_request'
                 && fromJson('["3.9"]')
@@ -35,12 +36,12 @@ jobs:
         # environment: [environment, environment-optional]
         conda-env: [environment]
         # On pull requests, only test two jobs:
-        # Ubuntu with Python 3.9, macOS with Python 3.11.
+        # Ubuntu with Python 3.9, macOS (arm64) with Python 3.11.
         # Build & Test currently uses Python 3.10 (on ubuntu-jammy).
         # Together, they cover the supported minor Python versions.
         include: >-
           ${{ github.event_name == 'pull_request'
-                && fromJson('[{"os": "macos", "python": "3.11", "conda-env": "environment"}]')
+                && fromJson('[{"os": "macos-latest", "python": "3.11", "conda-env": "environment"}]')
                 || fromJson('[]') }}
 
     steps:
@@ -69,7 +70,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           activate-environment: sage
-          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && 'macos' || 'linux' }}.yml
+          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment
         shell: bash -l {0}
@@ -89,8 +90,8 @@ jobs:
           # Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
           pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
         env:
-          SAGE_NUM_THREADS: 2
-        
+          SAGE_NUM_THREADS: 5
+
       - name: Verify dependencies
         if: success() || failure()
         shell: bash -l {0}

diff --git a/.github/workflows/conda-lock-update.py b/.github/workflows/conda-lock-update.py
@@ -11,8 +11,8 @@
 platforms = {
     "linux-64": "linux",
     "linux-aarch64": "linux-aarch64",
-    "osx-64": "macos",
-    "osx-arm64": "macos-arm64"
+    "osx-64": "macos-x86_64",
+    "osx-arm64": "macos"
     #"win-64": "win",
 }
 pythons = ["3.9", "3.10", "3.11"]

diff --git a/build/pkgs/_prereq/distros/conda.txt b/build/pkgs/_prereq/distros/conda.txt
@@ -7,7 +7,7 @@
 # One package per line. No need to escape special characters.
 # Everything on a line after a # character is ignored.
 #
-compilers<=1.6.0 # 1.7 pulls in c-compiler v.16
+compilers
 make
 m4
 perl