From f017fba04c38c719b1c00f19d8f45c07f9f296bf Mon Sep 17 00:00:00 2001
From: Arthur Lui <alui@lanl.gov>
Date: Tue, 21 May 2024 15:22:38 -0600
Subject: [PATCH] update ci

---
 .github/workflows/CI.yml | 7 ++++++-
 setup.py                 | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index bc9d502..ff20abe 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -5,7 +5,12 @@ on: [push]
 jobs:
   RunTests:
     runs-on: ${{ matrix.os }}
-    if: ${{ !contains(github.event.head_commit.message, 'Merge pull request') }}
+
+    # Don't run tests when merging PRs, they would have been run already and tests
+    # should have passed. The following checks hat the committer's email
+    # contains noreply; if it does, it's probably from github actions.
+    if: ${{ !contains(github.event.head_commit.committer.email, 'noreply') }}
+
     continue-on-error: ${{ matrix.python-version == 3.6 || matrix.os == 'windows-latest' }}
     strategy:
       matrix:
diff --git a/setup.py b/setup.py
index 49ead48..1c3adb0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='impala',
-    version='0.2.6',
+    version='0.2.7',
     description='Bayesian model calibration',
     url='http://www.github.com/lanl/impala',
     author='Devin Francom, others',