From 56d698c86c00ce5c423c0f6a6dccd929e85f981c Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Mon, 11 Sep 2023 14:22:28 +0100
Subject: [PATCH] Updated CI configuration

---
 .github/workflows/ci_workflows.yml | 58 +++++++++---------------------
 tox.ini                            |  7 +++-
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index 286cdb6..d2c285d 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -9,45 +9,19 @@ on:
 
 jobs:
   tests:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            python-version: 3.7
-            toxenv: py37-test-pytest46
-          - os: windows-latest
-            python-version: 3.7
-            toxenv: py37-test-pytest50
-          - os: macos-latest
-            python-version: 3.8
-            toxenv: py38-test-pytest52
-          - os: ubuntu-latest
-            python-version: 3.8
-            toxenv: py38-test-pytest53
-          - os: windows-latest
-            python-version: 3.9
-            toxenv: py39-test-pytest60
-          - os: macos-latest
-            python-version: 3.9
-            toxenv: py39-test-pytest61
-          - os: ubuntu-latest
-            python-version: '3.10'
-            toxenv: py310-test-pytest62
-          - os: ubuntu-latest
-            python-version: '3.10'
-            toxenv: py310-test-pytestdev
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install tox
-      run: python -m pip install tox
-    - name: Run tox
-      run: tox -v -e ${{ matrix.toxenv }}
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    with:
+      envs: |
+        - linux: py38-test-pytest46
+        - macos: py38-test-pytest50
+        - windows: py38-test-pytest52
+        - linux: py38-test-pytest53
+        - macos: py39-test-pytest60
+        - windows: py39-test-pytest61
+        - linux: py39-test-pytest62
+        - macos: py310-test-pytest70
+        - windows: py310-test-pytest71
+        - linux: py310-test-pytest72
+        - macos: py310-test-pytest73
+        - windows: py311-test-pytest74
+        - linux: py311-test-pytestdev
diff --git a/tox.ini b/tox.ini
index c278ab9..27d9da4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39,310}-test{,-devdeps}
+    py{38,39,310,311}-test{,-devdeps}
     codestyle
 requires =
     setuptools >= 30.3.0
@@ -18,6 +18,11 @@ deps =
     pytest60: pytest==6.0.*
     pytest61: pytest==6.1.*
     pytest62: pytest==6.2.*
+    pytest70: pytest==7.0.*
+    pytest71: pytest==7.1.*
+    pytest72: pytest==7.2.*
+    pytest73: pytest==7.3.*
+    pytest74: pytest==7.4.*
     pytestdev: git+https://github.com/pytest-dev/pytest#egg=pytest
 extras =
     test