Second attempt to remove xspec-modelsonly for macos-latest.

threeML · Sep 10, 2024 · 8f0ae00 · 8f0ae00
1 parent 17968b0
commit 8f0ae00
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -172,6 +172,16 @@ jobs:
 
             - name: Test conda install
               shell: bash -l {0}
+              run: python -m pytest -vv --cov=astromodels --cov-report=xml
+              if: ${{matrix.os}} == "macos-latest"
+              env:
+                OMP_NUM_THREADS: 1
+                MKL_NUM_THREADS: 1
+                NUMEXPR_NUM_THREADS: 1
+                MPLBACKEND: "Agg"
+            - name: Test conda install
+              shell: bash -l {0}
+              if: ${{matrix.os}} != "macos-latest" 
               run: |
               
                   echo "======>  importing XSPEC..."

diff --git a/conda-dist/recipe/meta.yaml b/conda-dist/recipe/meta.yaml
@@ -13,10 +13,10 @@ requirements:
     - {{ compiler('c') }} # [linux]
     - {{ compiler('cxx') }} # [linux]
     - {{ compiler('fortran') }} # [linux]
-    - xspec-modelsonly
-    - cfitsio
-    - ccfits
-    - wcslib
+    - xspec-modelsonly #[not arm64]
+    - cfitsio # [not arm64]
+    - ccfits # [not arm64]
+    - wcslib # [not arm64]
 
   host:
     - python
@@ -25,10 +25,10 @@ requirements:
     - numpy
     - pyyaml>=5.1
     - pandas>=0.23
-    - cfitsio
-    - ccfits
-    - wcslib
-    - xspec-modelsonly
+    - cfitsio # [not arm64]
+    - ccfits # [not arm64]
+    - wcslib # [not arm64]
+    - xspec-modelsonly # [not arm64]
     - future
     - numba>=0.54
     - h5py
@@ -46,9 +46,9 @@ requirements:
     - pytables
     - pandas>=0.23
     - dill
-    - cfitsio
-    - ccfits
-    - wcslib
+    - cfitsio # [not arm64]
+    - ccfits # [not arm64]
+    - wcslib # [not arm64]
     - future
     - numba>=0.54
     - h5py