More fixing

Author: DimitriPapadopoulos

.github/workflows/ci.yaml

@@ -49,39 +49,22 @@ jobs:
           conda config --show-sources
           conda list --show-channel-urls
 
-      - name: Meson args - use active Python include/lib (Ubuntu)
+      - name: Meson args - prefer Conda over system Python (Ubuntu)
         if: startsWith(matrix.platform, 'ubuntu')
         run: |
-          PY_INC=$(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
-          echo "PY_INC=$PY_INC" >> $GITHUB_ENV
-          echo "MESON_SETUP_ARGS=-Dc_args=-I${PY_INC} -Dc_link_args=-L${CONDA_PREFIX}/lib" >> $GITHUB_ENV
+          echo "MESONPY_PYTHON=$(python -c 'import sys; print(sys.executable)')" >> $GITHUB_ENV
 
       - name: Install numcodecs
         run: |
-          if [[ "${{ startsWith(matrix.platform, 'ubuntu') }}" == "true" ]]; then
-            # TODO: Remove this conditional when pcodec supports Python 3.14
-            if [[ "${{ matrix.python-version }}" == "3.14" ]]; then
-              python -m pip install -v \
-                --config-settings="setup-args=${MESON_SETUP_ARGS}" \
-                ".[test,test_extras,msgpack,google_crc32c,crc32c,zfpy]" \
-                pytest
-            else
-              python -m pip install -v \
-                --config-settings="setup-args=${MESON_SETUP_ARGS}" \
-                ".[test,test_extras,msgpack,google_crc32c,crc32c,pcodec,zfpy]" \
-                pytest
-            fi
+          # TODO: Remove this conditional when pcodec supports Python 3.14
+          if [[ "${{ matrix.python-version }}" == "3.14" ]]; then
+            python -m pip install -v \
+              ".[test,test_extras,msgpack,google_crc32c,crc32c,zfpy]" \
+              pytest
           else
-            # TODO: Remove this conditional when pcodec supports Python 3.14
-            if [[ "${{ matrix.python-version }}" == "3.14" ]]; then
-              python -m pip install -v \
-                ".[test,test_extras,msgpack,google_crc32c,crc32c,zfpy]" \
-                pytest
-            else
-              python -m pip install -v \
-                ".[test,test_extras,msgpack,google_crc32c,crc32c,pcodec,zfpy]" \
-                pytest
-            fi
+            python -m pip install -v \
+              ".[test,test_extras,msgpack,google_crc32c,crc32c,pcodec,zfpy]" \
+              pytest
           fi
 
       - name: List installed packages
@@ -132,31 +115,16 @@ jobs:
       - name: Install compilers
         run: conda install -y c-compiler cxx-compiler
 
-      - name: Meson args - use active Python include/lib (Ubuntu)
-        if: startsWith(matrix.platform, 'ubuntu')
+      - name: Meson args - prefer Conda over system Python (Ubuntu)
         run: |
-          PY_INC=$(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
-          echo "PY_INC=$PY_INC" >> $GITHUB_ENV
-          echo "MESON_SETUP_ARGS=-Dc_args=-I${PY_INC} -Dc_link_args=-L${CONDA_PREFIX}/lib" >> $GITHUB_ENV
+          echo "MESONPY_PYTHON=$(python -c 'import sys; print(sys.executable)')" >> $GITHUB_ENV
 
       - name: Install numcodecs
         run: |
-          if [[ "${{ startsWith(matrix.platform, 'ubuntu') }}" == "true" ]]; then
-            if [[ -n "${{ matrix.extras }}" ]]; then
-              python -m pip install -v \
-                --config-settings="setup-args=${MESON_SETUP_ARGS}" \
-                ".[${{ matrix.extras }},test]"
-            else
-              python -m pip install -v \
-                --config-settings="setup-args=${MESON_SETUP_ARGS}" \
-                ".[test]"
-            fi
+          if [[ -n "${{ matrix.extras }}" ]]; then
+            python -m pip install -v ".[${{ matrix.extras }},test]"
           else
-            if [[ -n "${{ matrix.extras }}" ]]; then
-              python -m pip install -v ".[${{ matrix.extras }},test]"
-            else
-              python -m pip install -v ".[test]"
-            fi
+            python -m pip install -v ".[test]"
           fi
 
       - name: List installed packages
@@ -207,22 +175,13 @@ jobs:
       - name: Install compilers
         run: conda install -y c-compiler cxx-compiler
 
-      - name: Meson args - use active Python include/lib (Ubuntu)
-        if: startsWith(matrix.platform, 'ubuntu')
+      - name: Meson args - prefer Conda over system Python (Ubuntu)
         run: |
-          PY_INC=$(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
-          echo "PY_INC=$PY_INC" >> $GITHUB_ENV
-          echo "MESON_SETUP_ARGS=-Dc_args=-I${PY_INC} -Dc_link_args=-L${CONDA_PREFIX}/lib" >> $GITHUB_ENV
+          echo "MESONPY_PYTHON=$(python -c 'import sys; print(sys.executable)')" >> $GITHUB_ENV
 
       - name: Install numcodecs and Zarr
         run: |
-          if [[ "${{ startsWith(matrix.platform, 'ubuntu') }}" == "true" ]]; then
-            python -m pip install -v \
-              --config-settings="setup-args=${MESON_SETUP_ARGS}" \
-              ".[test,test_extras]" "${{ matrix.zarr-pkg }}" crc32c
-          else
-            python -m pip install -v ".[test,test_extras]" "${{ matrix.zarr-pkg }}" crc32c
-          fi
+          python -m pip install -v  ".[test,test_extras]" "${{ matrix.zarr-pkg }}" crc32c
       - name: List installed packages
         run: python -m pip list