Auto-cancel duplicate CI

and remove unnecessary pytest version check I added earlier.
OGGM · Jan 9, 2024 · 32da10a · 32da10a
1 parent e57d11e
commit 32da10a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml
@@ -13,6 +13,10 @@ on:
   # Allow manual runs through the web UI
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1

diff --git a/pytest_mpl/plugin.py b/pytest_mpl/plugin.py
@@ -57,11 +57,7 @@
   Actual shape: {actual_shape}
     {actual_path}"""
 
-_pytest_version = Version(pytest.__version__)
-PYTEST_LT_7 = _pytest_version < Version("7.0.0")
-PYTEST_GE_8_0 = any([_pytest_version.is_devrelease,
-                     _pytest_version.is_prerelease,
-                     _pytest_version >= Version('8.0')])
+PYTEST_LT_7 = Version(pytest.__version__) < Version("7.0.0")
 
 # The following are the subsets of formats supported by the Matplotlib image
 # comparison machinery