Merge branch 'master' into update-plasma-docs

AlexHls · Nov 6, 2023 · cb9ff5d · cb9ff5d
2 parents fc730a7 + 87e8f3a
commit cb9ff5d
Show file tree

Hide file tree

Showing 27 changed files with 983 additions and 670 deletions.
diff --git a/.github/workflows/docstr-cov.yml b/.github/workflows/docstr-cov.yml
@@ -31,12 +31,12 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.x
 
       - name: Install interrogate
-        run: pip install interrogate==1.5.0 parse==1.19.0
+        run: pip install interrogate==1.5.0 parse==1.19.0 setuptools
 
       - name: Get SHAs
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,8 +15,8 @@ on:
 
 env:
   CACHE_NUMBER: 0  # increase to reset cache manually
-  PYTEST_FLAGS: --tardis-refdata=${{ github.workspace }}/tardis-refdata
-                --cov=tardis --cov-report=xml --cov-report=html
+  PYTEST_FLAGS: --tardis-refdata=${{ github.workspace }}/tardis-refdata --tardis-snapshot-data=${{ github.workspace }}/tardis-regressions
+                --cov=tardis --cov-report=xml --cov-report=html 
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 concurrency:
@@ -86,6 +86,12 @@ jobs:
         with:
           path: tardis-refdata/.git/lfs
           key: ${{ runner.os }}-lfs-${{ hashFiles('tardis-refdata/.lfs-assets-id') }}-v1
+
+      - name: Clone tardis-sn/tardis-regressions
+        uses: actions/checkout@v4
+        with:
+          repository: tardis-sn/tardis-regressions
+          path: tardis-regressions
 
       - name: Setup environment
         uses: conda-incubator/setup-miniconda@v2

diff --git a/.zenodo.json b/.zenodo.json
@@ -116,10 +116,10 @@
       "name": "Barbosa, Talytha"
     },
     {
-      "name": "Sondhi, Dhruv"
+      "name": "O'Brien, Jack"
     },
     {
-      "name": "O'Brien, Jack"
+      "name": "Sondhi, Dhruv"
     },
     {
       "name": "Yu, Jenny"
@@ -151,19 +151,22 @@
       "name": "Singh, Shreyas"
     },
     {
-      "name": "Eweis, Youssef"
+      "name": "Reinecke, Martin"
     },
     {
-      "name": "Reinecke, Martin"
+      "name": "Eweis, Youssef"
     },
     {
       "name": "Bylund, Tomas"
     },
+    {
+      "name": "Black, William"
+    },
     {
       "name": "Bentil, Laud"
     },
     {
-      "name": "Black, William"
+      "name": "Holas, Alexander"
     },
     {
       "name": "Eguren, Jordi",
@@ -178,9 +181,6 @@
     {
       "name": "Bartnik, Matthew"
     },
-    {
-      "name": "Holas, Alexander"
-    },
     {
       "name": "Varma Buddaraju, Rohith"
     },

diff --git a/conda-linux-64.lock b/conda-linux-64.lock