Skip to content

Commit

Permalink
Merge pull request #135 from pytest-dev/update-pythons
Browse files Browse the repository at this point in the history
Update pythons
  • Loading branch information
youtux committed Apr 17, 2022
2 parents 6da4a3c + 814c13a commit 72d406e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/psf/black
rev: 21.12b0
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/asottile/pyupgrade
rev: v2.29.1
rev: v2.32.0
hooks:
- id: pyupgrade
args: [--py36-plus]
args: [--py37-plus]
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ classifiers =
Topic :: Software Development :: Libraries
Topic :: Utilities
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
python_requires = >=3.6
python_requires = >=3.7
install_requires =
inflection
factory_boy>=2.10.0
Expand Down
7 changes: 5 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[tox]
distshare = {homedir}/.tox/distshare
envlist = py38-pytest{46,50,51,52,53,54,60,61,62,latest,main},
py{36,37,39,310}-pytestlatest
envlist = py38-pytest{46,50,51,52,53,54,60,61,62,70,71,latest,main},
py{37,39,310,311}-pytestlatest

[testenv]
commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests}
deps =
pytestlatest: pytest
pytestmain: git+https://github.com/pytest-dev/pytest.git@main
pytest71: pytest~=7.1.0
pytest70: pytest~=7.0.0
pytest62: pytest~=6.2.0
pytest61: pytest~=6.1.0
pytest60: pytest~=6.0.0
Expand Down Expand Up @@ -38,3 +40,4 @@ python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311

0 comments on commit 72d406e

Please sign in to comment.