Merge pull request #207 from threeML/dev

Dev

Author: omodei

.github/workflows/deploy.yml

@@ -19,6 +19,9 @@ jobs:
         name: Publish to PyPi
         if: github.event_name == 'push' && startsWith(github.event.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
@@ -31,10 +34,8 @@ jobs:
                   pip install wheel setuptools -U
                   python setup.py sdist
             - 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:
@@ -72,7 +73,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest, macos-latest]
+                os: [ubuntu-latest, macos-latest, macos-12]
                 python-version: [3.9]
 
         steps:

.github/workflows/test_and_build.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,8 +49,14 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip wheel
-                  pip install --upgrade flake8 coverage pytest-cov cython "tables==3.8.0"
-                  pip install git+https://github.com/EconForge/interpolation.py.git
+                  pip install --upgrade flake8 coverage pytest-cov cython
+                  
+                  if [[ ${{matrix.os}} == macos-latest ]];
+                  then
+                    brew update
+                    brew install hdf5
+                  fi
+
                   pip install -e .
             - name: Lint with flake8
               run: |
@@ -94,7 +100,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: ["ubuntu-latest", "macos-latest"]
+                os: ["ubuntu-latest", "macos-latest", "macos-12"]
                 python-version: [3.9]
         runs-on: ${{ matrix.os }}
         steps:

ci/environment.yml

@@ -22,7 +22,7 @@ dependencies:
   - wcslib
   - future
   - xspec-modelsonly==6.30.1
-  - numba<0.59
+  - numba
   - h5py
   - interpolation>=2.2.3
   - libgfortran

setup.cfg

@@ -36,8 +36,8 @@ install_requires =
     astropy>=1.2
     dill
     future
-    interpolation>=2.2.3	
-    numba<0.59
+    interpolation>=2.2.3
+    numba
     h5py
     pandas
     tables

setup.py

@@ -192,10 +192,16 @@ def find_library(library_root, additional_places=None):
 
 def setup_xspec():
 
+    skip_xspec = os.environ.get("SKIP_XSPEC")
     headas_root = os.environ.get("HEADAS")
     conda_prefix = os.environ.get("CONDA_PREFIX")
     xspec_version = os.environ.get("ASTRO_XSPEC_VERSION")
 
+    if skip_xspec is not None:
+
+        print("The SKIP_XSPEC env variable was set. Xspec support will not be installed.")
+        return None
+
     # thanks to the sherpa team for this
 
     if xspec_version is None: