Merge pull request #206 from threeML/dev

Dev
threeML · Feb 7, 2024 · 62f254c · 62f254c
2 parents 3524c2e + dcaa897
commit 62f254c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 30 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,9 +21,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout source
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
             - name: Set up Python 3.9
-              uses: actions/setup-python@v1
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.9
             - name: Build package
@@ -42,8 +42,8 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-python@v2
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v5
               with:
                   python-version: 3.9
 
@@ -77,23 +77,23 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
               with:
                   fetch-depth: 0
             # - name: Set up Python
-            #   uses: actions/setup-python@v2
+            #   uses: actions/setup-python@v5
             #   with:
             #       python-version: ${{ matrix.python-version }}
             # - name: Cache conda
-            #   uses: actions/cache@v2
+            #   uses: actions/cache@v4
             #   env:
             #     # Increase this value to reset cache if etc/example-environment.yml has not changed
             #     CACHE_NUMBER: 0
             #   with:
             #       path: ~/conda_pkgs_dir
             #       key: conda-${{ matrix.os }}-python-${{ matrix.python-version }}-${{ hashFiles('ci/environment.yml') }}
             - name: Add conda ${{ matrix.python-version }} to system path
-              uses: conda-incubator/setup-miniconda@v2
+              uses: conda-incubator/setup-miniconda@v3
               with:
                   activate-environment: "test_env"
                   auto-activate-base: false
@@ -178,19 +178,19 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
               with:
                   fetch-depth: 0
             - name: Cache conda
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               env:
                 # Increase this value to reset cache if etc/example-environment.yml has not changed
                 CACHE_NUMBER: 0
               with:
                   path: ~/conda_pkgs_dir
                   key: conda-${{ matrix.os }}-python-${{ matrix.python-version }}-${{ hashFiles('ci/environment.yml') }}
             - name: Add conda ${{ matrix.python-version }} to system path
-              uses: conda-incubator/setup-miniconda@v2
+              uses: conda-incubator/setup-miniconda@v3
               with:
                   activate-environment: "test_env"
                   auto-activate-base: false

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,18 +6,18 @@ jobs:
     name: "Build the notebooks for the docs"
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
-      - name: Checkout
-        uses: actions/checkout@v2
-
+      #- name: Checkout
+      #  uses: actions/checkout@v4
       - name: Init Environment
         #shell: bash -l {0}
         run: |
@@ -83,10 +83,10 @@ jobs:
           path: docs/notebooks
 
 
-      - name: Sleep for 5 min
+      - name: Sleep for 10 min
         uses: juliangruber/sleep-action@v1
         with:
-          time: 5m
+          time: 10m
 
       - name: Trigger RTDs build
         uses: dfm/rtds-action@main
@@ -99,13 +99,13 @@ jobs:
     name: "Create the API stubs"
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 
@@ -146,13 +146,13 @@ jobs:
     steps:
 
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -41,15 +41,15 @@ jobs:
         runs-on: ${{ matrix.os }}
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip wheel
-                  pip install --upgrade flake8 coverage pytest-cov cython
+                  pip install --upgrade flake8 coverage pytest-cov cython "tables==3.8.0"
                   pip install git+https://github.com/EconForge/interpolation.py.git
                   pip install -e .
             - name: Lint with flake8
@@ -81,7 +81,7 @@ jobs:
                 comment_mode: off
 
             - name: Upload coverage to Codecov
-              uses: codecov/codecov-action@v1
+              uses: codecov/codecov-action@v4
               with:
                   file: ./coverage.xml
                   files: ./coverage1.xml,./coverage2.xml
@@ -99,17 +99,17 @@ jobs:
         runs-on: ${{ matrix.os }}
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
             # - name: Cache conda
-            #   uses: actions/cache@v2
+            #   uses: actions/cache@v4
             #   env:
             #     # Increase this value to reset cache if etc/example-environment.yml has not changed
             #     CACHE_NUMBER: 0
             #   with:
             #       path: ~/conda_pkgs_dir
             #       key: conda-${{ matrix.os }}-python-${{ matrix.python-version }}-${{ hashFiles('ci/environment.yml') }}
             - name: Add conda ${{ matrix.python-version }} to system path
-              uses: conda-incubator/setup-miniconda@v2
+              uses: conda-incubator/setup-miniconda@v3
               with:
                   activate-environment: "test_env"
                   auto-activate-base: false
@@ -175,7 +175,7 @@ jobs:
                   MPLBACKEND: "Agg"
 
             - name: Upload coverage to Codecov
-              uses: codecov/codecov-action@v1
+              uses: codecov/codecov-action@v4
               with:
                   file: ./coverage.xml
                   files: ./coverage1.xml,./coverage2.xml

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -10,3 +10,5 @@ pandas
 numba<0.59
 sphinx_rtd_dark_mode
 joblib
+mock
+recommonmark