Actions updated.

threeML · May 13, 2024 · 32ec949 · 32ec949
1 parent f049b66
commit 32ec949
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -56,17 +56,8 @@ jobs:
                     brew install hdf5
                   fi
 
-                  #pip install --upgrade astromodels
                   if [[ "${ISDEV}" == "true" ]]; then
-                    #pip install --upgrade --pre --no-deps astromodels
-                    # temp fix!
-                    git clone https://github.com/threeML/astromodels
-                    cd astromodels
-                    git checkout dev
-  
-                    python -m pip install -e .
-
-                    cd ..
+                    pip install --upgrade --pre astromodels
                   else
                     pip install --upgrade astromodels
                   fi
@@ -249,6 +240,9 @@ jobs:
         name: Publish to PyPi
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
         runs-on: ubuntu-latest
+        permissions:
+            # IMPORTANT: this permission is mandatory for trusted publishing
+            id-token: write
         steps:
             - name: Checkout source
               uses: actions/checkout@v4
@@ -261,10 +255,8 @@ jobs:
                   pip install wheel setuptools -U
                   python setup.py sdist bdist_wheel
             - name: Publish
-              uses: pypa/gh-action-pypi-publish@v1.1.0
+              uses: pypa/gh-action-pypi-publish@release/v1
               with:
-                  user: __token__
-                  password: ${{ secrets.PYPI_TOKEN }}
                   skip-existing: true
 
     test-publish-pypi:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -40,8 +40,8 @@ jobs:
         shell: bash -l {0}
         run: |
           if [[ "${ISDEV}" == "true" ]]; then
-            #pip install --upgrade --pre astromodels
-            pip install git+https://github.com/threeML/astromodels.git@dev
+            pip install --upgrade --pre astromodels
+            #pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -127,8 +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 git+https://github.com/threeML/astromodels.git@dev
+            pip install --upgrade --pre astromodels
+            #pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -209,8 +209,8 @@ jobs:
           pip install "black<24"
           pip install fermipy
           if [[ "${ISDEV}" == "true" ]]; then
-            #pip install --upgrade --pre astromodels
-            pip install git+https://github.com/threeML/astromodels.git@dev
+            pip install --upgrade --pre astromodels
+            #pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -307,8 +307,8 @@ jobs:
           pip install "black<24"
           #pip install git+https://github.com/desihub/speclite.git
           if [[ "${ISDEV}" == "true" ]]; then
-            #pip install --upgrade --pre astromodels
-            pip install git+https://github.com/threeML/astromodels.git@dev
+            pip install --upgrade --pre astromodels
+            #pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -396,8 +396,8 @@ jobs:
           #pip install git+https://github.com/desihub/speclite.git
           
           if [[ "${ISDEV}" == "true" ]]; then
-            #pip install --upgrade --pre astromodels
-            pip install git+https://github.com/threeML/astromodels.git@dev
+            pip install --upgrade --pre astromodels
+            #pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi
@@ -581,8 +581,8 @@ jobs:
           pip3 install -r docs/requirements.txt
 
           if [[ "${ISDEV}" == "true" ]]; then
-            #pip install --upgrade --pre astromodels
-            pip install git+https://github.com/threeML/astromodels.git@dev
+            pip install --upgrade --pre astromodels
+            #pip install git+https://github.com/threeML/astromodels.git@dev
           else
             pip install --upgrade astromodels
           fi