Merge pull request #53 from utgwkk/change-ci-python-version

Add Python 3.10 and pytest 7 to CI

Author: utgwkk

.github/workflows/test.yml

@@ -18,28 +18,11 @@ jobs:
           - '3.7'
           - '3.8'
           - '3.9'
-        pytest-version:
-          - 4
-          - 5
-          - 6
-        exclude:
-          # pytest >= 5.x.x doesn't support Python 2.7
-          - os: ubuntu-latest
-            python-version: 2.7
-            pytest-version: 5
-          - os: ubuntu-latest
-            python-version: 2.7
-            pytest-version: 6
-          - os: windows-latest
-            python-version: 2.7
-            pytest-version: 5
-          - os: windows-latest
-            python-version: 2.7
-            pytest-version: 6
+          - '3.10'
 
     runs-on: ${{ matrix.os }}
 
-    name: ${{ matrix.os }}, Python ${{ matrix.python-version }}, pytest ${{ matrix.pytest-version }}
+    name: ${{ matrix.os }}, Python ${{ matrix.python-version }}
     steps:
     - uses: actions/checkout@v3
 
@@ -53,11 +36,36 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox tox-gh-actions
 
-    - name: Run test
+    - name: Run tests with PyTest 4
       run: tox
+      if: ${{ matrix.python-version != '3.10' }}
       env:
         PLATFORM: ${{ matrix.os }}
-        PYTEST_MAJOR_VERSION: ${{ matrix.pytest-version }}
+        PYTEST_MAJOR_VERSION: 4
+        PYTEST_PLUGINS: pytest_github_actions_annotate_failures
+
+    - name: Run tests with PyTest 5
+      run: tox
+      if: ${{ matrix.python-version != '2.7' && matrix.python-version != '3.10' }}
+      env:
+        PLATFORM: ${{ matrix.os }}
+        PYTEST_MAJOR_VERSION: 5
+        PYTEST_PLUGINS: pytest_github_actions_annotate_failures
+
+    - name: Run tests with PyTest 6
+      run: tox
+      if: ${{ matrix.python-version != '2.7' }}
+      env:
+        PLATFORM: ${{ matrix.os }}
+        PYTEST_MAJOR_VERSION: 6
+        PYTEST_PLUGINS: pytest_github_actions_annotate_failures
+
+    - name: Run tests with PyTest 7
+      run: tox
+      if: ${{ matrix.python-version != '2.7' }}
+      env:
+        PLATFORM: ${{ matrix.os }}
+        PYTEST_MAJOR_VERSION: 7
         PYTEST_PLUGINS: pytest_github_actions_annotate_failures
 
   post-test:

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-pytest4-{linux,windows}, py{36,37,38,39}-pytest{4,5,6}-{linux,windows}
+envlist = py27-pytest4-{linux,windows}, py{36,37,38,39}-pytest{4,5,6,7}-{linux,windows}, py{310}-pytest{6,7}-{linux,windows}
 
 [gh-actions]
 python =
@@ -8,6 +8,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
 
 [gh-actions:env]
 PLATFORM =
@@ -18,12 +19,14 @@ PYTEST_MAJOR_VERSION =
     4: pytest4
     5: pytest5
     6: pytest6
+    7: pytest7
 
 [testenv]
 deps =
     -rrequirements.txt
     pytest4: pytest>=4.0.0,<5.0.0
     pytest5: pytest>=5.0.0,<6.0.0
     pytest6: pytest>=6.0.0,<7.0.0
+    pytest7: pytest>=7.0.0,<8.0.0
 
 commands = {envpython} -m pytest