Merge pull request #18 from simpeg/ci_maintenance

Reconfigure

Author: jcapriot

.github/workflows/python-package-conda.yml

@@ -22,28 +22,24 @@ jobs:
     strategy:
       fail-fast: False
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        mkl-version: ['2023']  # currently 2024 fails building for some reason...
+        os: [ubuntu-latest, macos-12, windows-latest]
+        python-version: ["3.10", "3.11", "3.12"]
+        mkl-version: ['2023', '2024']
         include:
           - os: ubuntu-latest
             python-version: "3.12"
             coverage: ${{ true }}
-          - os: ubuntu-latest
-            python-version: "3.12"
-            mkl-version: '2024'
-          - os: windows-latest
-            python-version: "3.12"
-            mkl-version: '2024'
+        exclude:
+          - os: macos-12
+            mkl-version: "2024"
 
     steps:
     - uses: actions/checkout@v4
     - name: Setup Conda
       uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
-        mamba-version: '*'
-        channels: conda-forge, defaults
+        channels: defaults
         channel-priority: true
         activate-environment: dev
 
@@ -55,22 +51,25 @@ jobs:
 
     - name: Create environment
       run: |
-        mamba install --quiet --yes pip numpy scipy cython mkl=${{ matrix.mkl-version }} pytest \
+        conda install --quiet --yes -c conda-forge \
+          pip numpy scipy cython mkl=${{ matrix.mkl-version }} pytest \
           mkl-devel pkg-config meson-python meson ninja setuptools_scm \
-          ${{ matrix.coverage && 'coverage' || ''}}
+          ${{ matrix.coverage && 'coverage' || ''}} \
+          ${{ matrix.os == 'windows-latest' && '"libblas=*=*mkl"' || ''}}
 
     - name: Install Our Package
       run: |
         python -m pip install --no-build-isolation --verbose --editable . \
           --config-setting=compile-args=-v \
-          ${{ matrix.coverage && '--config-settings=setup-args="-Dcy_coverage=true"' || ''}}
+          ${{ matrix.coverage && '--config-settings=setup-args="-Db_coverage=true"' || ''}} \
+          ${{ matrix.os == 'windows-latest' && '--config-settings=setup-args="-Dvsenv=true"' || ''}}
+
         conda list
 
     - name: Run Tests
       run: |
         ${{ matrix.coverage && 'coverage run -m' || '' }} pytest -s -v
         ${{ matrix.coverage && 'coverage xml' || '' }}
-      continue-on-error: ${{ matrix.os == 'windows-latest' && matrix.mkl-version == '2024'}}
 
     - name: Upload coverage
       if: ${{ matrix.coverage }}
@@ -93,9 +92,8 @@ jobs:
     - name: Setup Conda
       uses: conda-incubator/setup-miniconda@v3
       with:
-        python-version: 3.11
-        mamba-version: '*'
-        channels: conda-forge, defaults
+        python-version: "3.11"
+        channels: defaults
         channel-priority: true
         activate-environment: dev
 
@@ -107,7 +105,7 @@ jobs:
 
     - name: Create environment
       run: |
-        mamba install --quiet --yes pip numpy scipy cython mkl=2023 \
+        conda install --quiet --yes pip numpy scipy cython mkl=2023 \
           mkl-devel pkg-config meson-python meson ninja setuptools_scm \
           python-build
 

meson.build

@@ -14,7 +14,7 @@ print(get_version())'''
 ).stdout().strip(),
 
   license: 'MIT',
-  meson_version: '>= 1.1.0',
+  meson_version: '>= 1.4.0',
   default_options: [
     'buildtype=debugoptimized',
     'b_ndebug=if-release',

meson.options

@@ -1,5 +1,3 @@
-option('cy_coverage', type : 'boolean', value : false)
-
 option('use-sdl', type: 'boolean', value: true,
        description: 'Use the single dynamic library.')