Skip to content

Commit

Permalink
Merge pull request #133 from skarzi/feature/deps/update-supported-pyt…
Browse files Browse the repository at this point in the history
…hon-and-pytest-versions
  • Loading branch information
youtux committed May 2, 2022
2 parents b5f8bdf + 9b5a0cd commit bdfd2be
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
---
name: Main testing workflow

on:
push:
pull_request:
workflow_dispatch:

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -25,5 +24,4 @@ jobs:
pip install -U setuptools
pip install tox tox-gh-actions
- name: Test with tox
run: |
tox
run: tox
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ python_requires = >=3.7
install_requires =
inflection
factory_boy>=2.10.0
pytest>=4.6
pytest>=5.0.0
mako
appdirs
tests_require = tox
Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
distshare = {homedir}/.tox/distshare
envlist = py38-pytest{46,50,51,52,53,54,60,61,62,70,71,latest,main},
envlist = py38-pytest{50,51,52,53,54,60,61,62,70,71,latest,main},
py{37,39,310,311}-pytestlatest

[testenv]
Expand All @@ -18,24 +18,22 @@ deps =
pytest52: pytest~=5.2.0
pytest51: pytest~=5.1.0
pytest50: pytest~=5.0.0
pytest46: pytest~=4.6.0

-r{toxinidir}/requirements-testing.txt

[testenv:py38-pytestmain]
# allow failures of tests run for `pytest` installed from `main` branch
ignore_outcome = true

[testenv:py310-pytestlatest]
# allow failures of tests run with unstable python 3.10
[testenv:py311-pytestlatest]
# allow failures of tests run with unstable python 3.11
ignore_outcome = true

[pytest]
addopts = -vv -l

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
Expand Down

0 comments on commit bdfd2be

Please sign in to comment.