Merge pull request #205 from threeML/dev

Update workflow and doc

.github/workflows/docs.yml

@@ -77,7 +77,7 @@ jobs:
 
           ls docs/notebooks
           
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: notebooks-for-${{ github.sha }}
           path: docs/notebooks
@@ -133,7 +133,7 @@ jobs:
           sphinx-apidoc -f -o docs/api/ astromodels
 
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: api-stubs-for-${{ github.sha }}
           path: docs/api

.github/workflows/test_and_build.yml

@@ -34,9 +34,11 @@ jobs:
         needs: skip_duplicate
         if: ${{ needs.skip_duplicate.outputs.should_skip == 'false' }}
         strategy:
+            fail-fast: false
             matrix:
-                python-version: [3.7, 3.8, 3.9]
-        runs-on: ubuntu-latest
+                python-version: ["3.9", "3.10", "3.11"]
+                os: ["ubuntu-latest", "macos-latest"]
+        runs-on: ${{ matrix.os }}
         steps:
             - name: Checkout
               uses: actions/checkout@v2
@@ -48,6 +50,7 @@ jobs:
               run: |
                   python -m pip install --upgrade pip wheel
                   pip install --upgrade flake8 coverage pytest-cov cython
+                  pip install git+https://github.com/EconForge/interpolation.py.git
                   pip install -e .
             - name: Lint with flake8
               run: |
@@ -63,9 +66,16 @@ jobs:
                   NUMEXPR_NUM_THREADS: 1
                   MPLBACKEND: "Agg"
 
-            - name: Publish Unit Test Results
-              uses: EnricoMi/publish-unit-test-result-action@v1
-              if: always()
+            - name: Publish Unit Test Results Ubuntu
+              uses: EnricoMi/publish-unit-test-result-action@v2
+              if: runner.os == 'Linux'
+              with:
+                files: junit/test-*.xml
+                comment_mode: off
+
+            - name: Publish Unit Test Results MacOS
+              uses: EnricoMi/publish-unit-test-result-action/composite@v2
+              if: runner.os == 'macOS'
               with:
                 files: junit/test-*.xml
                 comment_mode: off
@@ -85,7 +95,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: ["ubuntu-latest", "macos-latest"]
-                python-version: [3.7, 3.9]
+                python-version: [3.9]
         runs-on: ${{ matrix.os }}
         steps:
             - name: Checkout

ci/environment.yml

@@ -22,9 +22,9 @@ dependencies:
   - wcslib
   - future
   - xspec-modelsonly==6.30.1
-  - numba>=0.54
+  - numba<0.59
   - h5py
-  - interpolation>=2.2.2
+  - interpolation>=2.2.3
   - libgfortran
   - omegaconf
   - colorama

docs/requirements.txt

@@ -7,6 +7,6 @@ nbsphinx
 cython
 numpy
 pandas
-numba
+numba<0.59
 sphinx_rtd_dark_mode
 joblib

setup.cfg

@@ -10,7 +10,7 @@ url = https://github.com/threeml/astromodels
 
 author_email = [email protected]
 author = Giacomo Vianello
-requires_python = >=3.7.0
+requires_python = >=3.9.0
 
 
 project_urls =
@@ -23,8 +23,6 @@ classifiers =
     Topic :: Scientific/Engineering :: Astronomy
     Intended Audience :: Science/Research
     Operating System :: POSIX
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Environment :: Console
 
@@ -39,7 +37,7 @@ install_requires =
     dill
     future
     interpolation>=2.2.3	
-    numba>0.52
+    numba<0.59
     h5py
     pandas
     tables