Another attempt to fix actions.

threeML · May 9, 2024 · 9873e1d · 9873e1d
1 parent 9a856c1
commit 9873e1d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 33 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -50,22 +50,19 @@ jobs:
               run: |
                   python -m pip install --upgrade pip wheel
 
-                  # 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
+                  #pip install --upgrade astromodels
                   if [[ "${ISDEV}" == "true" ]]; then
                     #pip install --upgrade --pre --no-deps astromodels
                     # temp fix!
                     pip install git+https://github.com/threeML/astromodels.git@dev
+                  else
+                    pip install --upgrade astromodels
                   fi
                   
                   pip install --upgrade flake8 coverage pytest-cov cython
@@ -98,7 +95,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
@@ -110,12 +107,6 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip wheel
-                  
-                  # 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

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -30,7 +30,7 @@ jobs:
 
 
           pip install zeus-mcmc
-          pip install git+https://github.com/desihub/speclite.git
+          #pip install git+https://github.com/desihub/speclite.git
           pip install "black<24"
 
           pip install astromodels
@@ -40,7 +40,8 @@ jobs:
         shell: bash -l {0}
         run: |
           if [[ "${ISDEV}" == "true" ]]; then
-            pip install --upgrade --pre astromodels
+            #pip install --upgrade --pre astromodels
+            pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -75,7 +76,7 @@ jobs:
 
   hal_notebooks:
     name: "Build the HAL notebooks"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -126,7 +127,8 @@ jobs:
           pip install "black<24"
           pip install git+https://github.com/threeml/hawc_hal.git
           if [[ "${ISDEV}" == "true" ]]; then
-            pip install --upgrade --pre astromodels
+            #pip install --upgrade --pre astromodels
+            pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -157,7 +159,7 @@ jobs:
 
   fermi_notebooks:
     name: "Build the Fermi notebooks"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -207,7 +209,8 @@ jobs:
           pip install "black<24"
           pip install fermipy
           if [[ "${ISDEV}" == "true" ]]; then
-            pip install --upgrade --pre astromodels
+            #pip install --upgrade --pre astromodels
+            pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -253,7 +256,7 @@ jobs:
 
   xspec_notebooks:
     name: "Build the XSPEC notebooks"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -302,9 +305,10 @@ jobs:
         run: |
           pip install zeus_mcmc dynesty
           pip install "black<24"
-          pip install git+https://github.com/desihub/speclite.git
+          #pip install git+https://github.com/desihub/speclite.git
           if [[ "${ISDEV}" == "true" ]]; then
-            pip install --upgrade --pre astromodels
+            #pip install --upgrade --pre astromodels
+            pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -339,7 +343,7 @@ jobs:
 
   multinest_notebooks:
     name: "Build the multinest notebooks"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -389,9 +393,11 @@ jobs:
           pip install zeus_mcmc dynesty
           pip install "black<24"
           #pip install --no-binary :all: root_numpy
-          pip install git+https://github.com/desihub/speclite.git
+          #pip install git+https://github.com/desihub/speclite.git
+          
           if [[ "${ISDEV}" == "true" ]]; then
-            pip install --upgrade --pre astromodels
+            #pip install --upgrade --pre astromodels
+            pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -437,7 +443,7 @@ jobs:
   upload_notebooks:
     needs: [fast_notebooks, fermi_notebooks, hal_notebooks, xspec_notebooks, multinest_notebooks]
     name: "Upload notebooks and trigger RTD"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
@@ -495,7 +501,7 @@ jobs:
 
   api_doc:
     name: "Create the API stubs"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -541,7 +547,7 @@ jobs:
 
   build_docs:
     name: "Build the Documentation"
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     needs: [upload_notebooks, api_doc]
     steps:
 
@@ -575,7 +581,8 @@ jobs:
           pip3 install -r docs/requirements.txt
 
           if [[ "${ISDEV}" == "true" ]]; then
-            pip install --upgrade --pre astromodels
+            #pip install --upgrade --pre astromodels
+            pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi

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

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

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -8,7 +8,7 @@ nbsphinx
 cython
 numpy
 pandas
-numba<0.59
+numba
 sphinx_rtd_dark_mode
 mock
 recommonmark