From 3570d0ba89f4a5cd557576c610965ba9a9698a48 Mon Sep 17 00:00:00 2001
From: Konrad Rokicki <rokickik@janelia.hhmi.org>
Date: Sat, 19 Oct 2024 11:53:49 -0400
Subject: [PATCH] fixed CI

---
 .github/workflows/python-ci.yml | 11 +++++++++++
 environment.yml                 |  1 +
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 1e5e455..655fc6b 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -4,6 +4,17 @@ on:
   push:
     branches: [ main ]
 
+# When this workflow is queued, automatically cancel any previous running
+# or pending jobs from the same branch
+concurrency:
+  group: conda-${{ github.ref }}
+  cancel-in-progress: true
+
+# Required shell entrypoint to have properly activated conda environments
+defaults:
+  run:
+    shell: bash -l {0}
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/environment.yml b/environment.yml
index 42766b2..a1ece91 100644
--- a/environment.yml
+++ b/environment.yml
@@ -22,6 +22,7 @@ dependencies:
   - pydantic
   - pydantic-settings
   - ray-default
+  - pytest
   - pip
   - pip:
     - microfilm