Trying to fix actions.

threeML · May 8, 2024 · 9a856c1 · 9a856c1
1 parent 0dffe92
commit 9a856c1
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 41 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -37,7 +37,7 @@ jobs:
             fail-fast: false
             matrix:
                 python-version: ["3.9","3.10","3.11"]
-                os: ["ubuntu-latest", "macos-latest"]
+                os: ["ubuntu-latest", "macos-latest", "macos-12"]
         runs-on:  ${{ matrix.os }}
         steps:
             - name: Checkout
@@ -49,19 +49,27 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip wheel
-                  pip install tables==3.8.0
-                  pip install git+https://github.com/EconForge/interpolation.py.git
+
+                  # temp fixes
+                  #pip install git+https://github.com/desihub/speclite.git
+                  #pip install tables==3.8.0
+                  #pip install git+https://github.com/EconForge/interpolation.py.git
+
+                  if [[ ${{matrix.os}} == macos-latest ]];
+                  then
+                    brew update
+                    brew install hdf5
+                  fi
 
                   pip install --upgrade astromodels
                   if [[ "${ISDEV}" == "true" ]]; then
-                    pip install --upgrade --pre --no-deps astromodels
+                    #pip install --upgrade --pre --no-deps astromodels
+                    # temp fix!
+                    pip install git+https://github.com/threeML/astromodels.git@dev
                   fi
                   
                   pip install --upgrade flake8 coverage pytest-cov cython
 
-                  # temp fixes
-                  #pip install git+https://github.com/desihub/speclite.git
-                  
                   pip install -e .
               env:
                   ISDEV: ${{contains(github.ref, 'dev') || contains(github.base_ref, 'dev')}}
@@ -102,9 +110,18 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip wheel
-                  python -m pip install cython extension_helpers astropy numpy numba tempita h5py
-                  pip install tables==3.8.0
-                  pip install git+https://github.com/EconForge/interpolation.py.git
+                  
+                  # temp fixes
+                  #python -m pip install cython extension_helpers astropy numpy numba tempita h5py
+                  #pip install git+https://github.com/desihub/speclite.git
+                  #pip install tables==3.8.0
+                  #pip install git+https://github.com/EconForge/interpolation.py.git
+
+                  if [[ ${{matrix.os}} == macos-latest ]];
+                  then
+                    brew update
+                    brew install hdf5
+                  fi
 
                   git clone https://github.com/threeML/astromodels
                   cd astromodels
@@ -116,9 +133,6 @@ jobs:
 
                   pip install --upgrade flake8 coverage pytest-cov cython
 
-                  # temp fixes
-                  #pip install git+https://github.com/desihub/speclite.git
-
                   pip install -e .
             - name: Lint with flake8
               run: |
@@ -146,7 +160,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: ["ubuntu-latest", "macos-latest"]
+                os: ["ubuntu-latest", "macos-12"]
                 python-version: [3.9]
         runs-on: ${{ matrix.os }}
         steps:

diff --git a/.github/workflows/conda_build.yml b/.github/workflows/conda_build.yml
@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: ["ubuntu-latest", "macos-latest"]
+                os: ["ubuntu-latest", "macos-latest", "macos-12"]
                 python-version: [3.9]
 
         steps:

diff --git a/.github/workflows/pip_install.yml b/.github/workflows/pip_install.yml
@@ -28,11 +28,17 @@ jobs:
     - name: Install base wheel
       run: |
         python -m pip install --upgrade pip wheel
+        if [[ ${{matrix.os}} == macos-latest ]];
+        then
+          brew update
+          brew install hdf5
+        fi
         python -m pip install astromodels
 
     - name: Install 3ML
       run: |
         python setup.py install
+
   test-install-pip:
     strategy:
       fail-fast: false
@@ -54,6 +60,11 @@ jobs:
     - name: Install base wheel
       run: |
         python -m pip install --upgrade pip wheel
+        if [[ ${{matrix.os}} == macos-latest ]];
+        then
+          brew update
+          brew install hdf5
+        fi
         python -m pip install astromodels
 
     - name: Install 3ML

diff --git a/ci/environment.yml b/ci/environment.yml
@@ -36,7 +36,7 @@ dependencies:
   - ipywidgets
   - ipython
   - ipyparallel
-  - numba<0.59
+  - numba
   - xz
   - py
   - numexpr

diff --git a/conda-dist/recipes/threeml/meta.yaml b/conda-dist/recipes/threeml/meta.yaml
@@ -20,47 +20,35 @@ requirements:
     # - {{ compiler('cxx') }}
     # - {{ compiler('fortran') }}
     - python
-    #- setuptools
-    #- toolchain
     - numpy>=1.15
-    #- scipy >=0.18
     - emcee>=3
-    #- astropy >=1.0.3
-    #- matplotlib
     - uncertainties
     - pyyaml>=5.1
     - dill
     - iminuit>=2
     - astromodels>=2
-    - astroquery<0.4 # [py2k]
-    - astroquery # [py3k]
+    - astroquery
     - corner>=1.0.2
-    #- corner
-    #- pandas
     - requests
     - speclite
     - multinest
     - pymultinest
-    - ultranest # [py3k]
+    - ultranest
     - dynesty>=1
-    #- pygmo>=2.4,<=2.11.4 # [py2k]
     - pygmo>=2.4
     - ipywidgets
     - numba
-    #- ipython
     - ipyparallel
     - py
-    #- tk==8.5.19 # [py2k]
-    - ipopt<3.13 # [py2k]
     - numdifftools
-    - interpolation>=2.1.5 # [py3k]
+    - interpolation>=2.1.5
     - tqdm>=4.56.0
     - colorama
     - omegaconf
 
   run:
     - python
-    - numpy>=1.15 # [py3k]
+    - numpy>=1.15
     - scipy>=0.18
     - emcee>=3
     - astropy>=1.0.3
@@ -70,28 +58,24 @@ requirements:
     - dill
     - iminuit>=2
     - astromodels>=2.3.8
-    - astroquery<0.4 # [py2k]
-    - astroquery # [py3k]
+    - astroquery 
     - corner>=1.0.2
     - pandas>=0.23
     - requests
     - speclite
     - multinest
     - pymultinest
-    - ultranest # [py3k]
+    - ultranest
     - dynesty>=1
-    #- pygmo>=2.4,<=2.11.4 # [py2k]
     - pygmo>=2.4
     - ipywidgets
     - ipython
     - ipyparallel
     - numba
     - xz
     - py
-    - pytest<4 # [py2k]
-    - pytest # [py3k]
+    - pytest 
     - numexpr
-    - ipopt<3.13 # [py2k]
     - numdifftools
     - tqdm>=4.56.0
     - omegaconf

diff --git a/setup.cfg b/setup.cfg
@@ -33,7 +33,7 @@ install_requires =
     numpy>=1.16
     scipy>=1.4	
     emcee>=3
-    astropy>=1.3.3
+    astropy
     matplotlib
     uncertainties
     pyyaml>=5.1
@@ -50,7 +50,7 @@ install_requires =
     joblib
     numexpr
     dynesty
-    numba<0.59
+    numba
     numdifftools
     tqdm>=4.56.0
     colorama