Merge branch 'refs/heads/develop'

SMTG-Bham · May 24, 2024 · 7299a0a · 7299a0a
2 parents 235bc8d + 39df330
commit 7299a0a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/.github/workflows/pip_install_test.yml b/.github/workflows/pip_install_test.yml
@@ -40,8 +40,17 @@ jobs:
           sleep 360  # wait 10 minutes for PyPI to update with the new release
           python -m pip install --upgrade pip
           pip install doped[tests]  # install only from PyPI
+
+      - name: Install spglib on macOS
+        if: matrix.os == 'macos-14'
+        run: |
           pip install git+https://github.com/spglib/spglib --config-settings=cmake.define.SPGLIB_SHARED_LIBS=OFF  # avoid spglib warnings
 
+      - name: Install spglib on ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          conda install -c conda-forge spglib  # avoid spglib warnings
+
       - name: Test
         run: |
           pytest -vv -m "not mpl_image_compare" tests  # all non-plotting tests

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,8 +34,17 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -e .[tests]
+
+      - name: Install spglib on macOS
+        if: matrix.os == 'macos-14'
+        run: |
           pip install git+https://github.com/spglib/spglib --config-settings=cmake.define.SPGLIB_SHARED_LIBS=OFF  # avoid spglib warnings
 
+      - name: Install spglib on ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          conda install -c conda-forge spglib  # avoid spglib warnings
+
       - name: Test
         run:  |
           pytest -vv -m "not mpl_image_compare" tests  # all non-plotting tests