add option to ignore mkl dep during source dist generation

Author: jcapriot

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

@@ -106,27 +106,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.13"
-
-      - name: Add Intel repository
-        run: |
-          wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-          sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-          rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-          sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
-          sudo apt-get update
-
-      - name: Install Intel OneAPI
-        run: |
-          sudo apt-get install intel-oneapi-mkl-devel
-
       - name: Build sdist
-        run: |
-          source ${{ env.ONEAPI_ROOT }}/setvars.sh
-          pipx run build --sdist
+        run: pipx run build --sdist -Csetup-args="-Ddist_ignore_mkl_dep=true"
 
       - uses: actions/upload-artifact@v4
         with:

meson.options

@@ -5,4 +5,8 @@ option('use-ilp64', type: 'boolean', value: false,
        description: 'Use ILP64 (64-bit integer) BLAS and LAPACK interfaces')
 
 option('mkl-threading', type: 'string', value: 'auto',
-        description: 'MKL threading method, one of: `seq`, `iomp`, `gomp`, `tbb`')
+        description: 'MKL threading method, one of: `seq`, `iomp`, `gomp`, `tbb`')
+
+option('dist_ignore_mkl_dep', type: 'boolean', value: false,
+       description: 'Mark the mkl dep as optional, for use during source distribution archiving.'
+)

pydiso/meson.build

@@ -40,8 +40,10 @@ mkl_version_req = '>=2023.0'
 
 use_sdl = get_option('use-sdl')
 
+mkl_required = not get_option('dist_ignore_mkl_dep')
+
 if use_sdl
-    mkl_dep = dependency('mkl-sdl', required: true)
+    mkl_dep = dependency('mkl-sdl', required: mkl_required)
 else
     # find mkl
     mkl_dep = dependency(mkl_dep_name,
@@ -55,7 +57,7 @@ else
     # or missing it because no pkg-config installed. If so, we need to retry
     # with MKL SDL, and drop the version constraint.
     if not mkl_dep.found() and mkl_may_use_sdl
-        mkl_dep = dependency('mkl-sdl', required: true)
+        mkl_dep = dependency('mkl-sdl', required: mkl_required)
     endif
 
 endif