Skip to content

Commit

Permalink
ci: fix by adding limit (#84)
Browse files Browse the repository at this point in the history
* ci: fix by adding limit

* ci: expand matrix

* Update test.yml

* Update test.yml
  • Loading branch information
henryiii committed May 15, 2024
1 parent 2ce469f commit f0bb8d6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ jobs:
- '3.8'
- '3.9'
- '3.10'
include:
- os: ubuntu-22.04
python-version: '3.7'
- os: windows-latest
python-version: '3.7'

- '3.11'
- '3.12'
runs-on: ${{ matrix.os }}

name: ${{ matrix.os }}, Python ${{ matrix.python-version }}
Expand All @@ -44,15 +40,15 @@ jobs:

- name: Run tests with PyTest 4
run: tox
if: ${{ matrix.python-version != '3.10' }}
if: "!startsWith(matrix.python-version, '3.1')"
env:
PLATFORM: ${{ matrix.os }}
PYTEST_MAJOR_VERSION: 4
PYTEST_PLUGINS: pytest_github_actions_annotate_failures

- name: Run tests with PyTest 5
run: tox
if: ${{ matrix.python-version != '3.10' }}
if: "!startsWith(matrix.python-version, '3.1')"
env:
PLATFORM: ${{ matrix.os }}
PYTEST_MAJOR_VERSION: 5
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[tox]
envlist =
py27-pytest4-{linux,windows}
py{36,37,38,39}-pytest{4,5,6,7}-{linux,windows}
py{310}-pytest{6,7}-{linux,windows}
py{37,38,39}-pytest{4,5,6,7}-{linux,windows}
py{310,311,312}-pytest{6,7}-{linux,windows}
pkg

[gh-actions]
Expand All @@ -11,6 +10,8 @@ python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[gh-actions:env]
PLATFORM =
Expand All @@ -29,7 +30,7 @@ deps =
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
pytest7: pytest>=7.0.0,<7.4.0

commands = {envpython} -m pytest

Expand Down

0 comments on commit f0bb8d6

Please sign in to comment.