Merge pull request #1318 from flatironinstitute/dev

Merge to main for 1.10.5 release
flatironinstitute · Apr 2, 2024 · 6470495 · 6470495
2 parents 83ce6ce + 66e2bcf
commit 6470495
Show file tree

Hide file tree

Showing 29 changed files with 1,421 additions and 722 deletions.
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -29,6 +29,11 @@ jobs:
           environment-file: environment.yml
           activate-environment: caiman
 
+      - name: Install OS Dependencies
+        shell: bash -l {0}
+        run: |
+          sudo apt-get install libglapi-mesa libegl-mesa0 libegl1 libopengl0 libgl1-mesa-glx
+
       - name: Install Dependencies
         shell: bash -l {0}
         run: |

diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ __pycache__/
 *.pyc
 *.npy
 *.mat
+!testdata/*.mat
 *.hdf5
 *.mmap
 *.npz

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.md b/README.md
@@ -117,7 +117,7 @@ If possible, we'd also ask that you cite the papers where the original algorithm
 # Main developers
 * (emeritus) Eftychios A. Pnevmatikakis, **Flatiron Institute, Simons Foundation** 
 * (emeritus) Andrea Giovannucci, **University of North Carolina, Chapel Hill**
-* Johannes Friedrich, **Allen Institute,Seattle Washington**
+* Johannes Friedrich, **Allen Institute, Seattle Washington**
 * Changjia Cai, **University of North Carolina, Chapel Hill**
 * Pat Gunn, **Flatiron Institute, Simons Foundation**
 * Eric Thomson, **Flatiron Institute, Simons Foundation**
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ __pycache__/ @@
     *.pyc
     *.npy
     *.mat
+    !testdata/*.mat
     *.hdf5
     *.mmap
     *.npz
@@ Expand Down @@