Skip to content

Commit 071a34e

Browse files
committed
Create patch release
Supports Python 3.6 to 3.10 and pytest 4.0 to 7.0.
1 parent f30d9bf commit 071a34e

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
python: [3.6, 3.7, 3.8, 3.9, pypy3]
20+
python: [3.6, 3.7, 3.8, 3.9, pypy]
2121

2222
steps:
2323
- uses: actions/checkout@v2
2424
with:
2525
fetch-depth: 0
2626

2727
- name: Set up Python ${{ matrix.python }}
28-
uses: actions/setup-python@v2
28+
uses: actions/setup-python@v3
2929
with:
3030
python-version: ${{ matrix.python }}
3131

@@ -36,27 +36,27 @@ jobs:
3636
3737
- name: Test with Python 3.6
3838
if: matrix.python == '3.6'
39-
run: tox -e "py36-pytest_{4,50,51,52,53,54,60,61,62,latest}"
39+
run: tox -e "py36-pytest{4,50,51,52,53,54,60,61,62,70}"
4040

4141
- name: Test with Python 3.7
4242
if: matrix.python == '3.7'
43-
run: tox -e "py37-pytest_{4,50,51,52,53,54,60,61,62,latest}"
43+
run: tox -e "py37-pytest{4,50,51,52,53,54,60,61,62,70}"
4444

4545
- name: Test with Python 3.8
4646
if: matrix.python == '3.8'
47-
run: tox -e "py38-pytest_{4,50,51,52,53,54,60,61,62,latest}"
47+
run: tox -e "py38-pytest{4,50,51,52,53,54,60,61,62,70}"
4848

4949
- name: Test with Python 3.9
5050
if: matrix.python == '3.9'
51-
run: tox -e "py39-pytest_{4,50,51,52,53,54,60,61,62,latest}"
51+
run: tox -e "py39-pytest{4,50,51,52,53,54,60,61,62,70}"
5252

5353
- name: Test with Python 3.10
5454
if: matrix.python == '3.10'
55-
run: tox -e "py310-pytest_{62,latest}"
55+
run: tox -e "py310-pytest{62,70}"
5656

5757
- name: Test with PyPy
58-
if: matrix.python == 'pypy3'
59-
run: tox -e "pypy-pytest_{4,50,51,52,53,54,60,61,62,latest}"
58+
if: matrix.python == 'pypy'
59+
run: tox -e "pypy-pytest{4,50,51,52,53,54,60,61,62,70}"
6060

6161
- name: Linting with Flake8
6262
if: matrix.python == '3.9'
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
fetch-depth: 0
7676

77-
- uses: actions/setup-python@v2
77+
- uses: actions/setup-python@v3
7878
with:
7979
python-version: "3.9"
8080

@@ -87,7 +87,7 @@ jobs:
8787
run: python setup.py sdist bdist_wheel
8888

8989
- name: Publish package
90-
uses: pypa/gh-action-pypi-publish@v1.4.2
90+
uses: pypa/gh-action-pypi-publish@v1
9191
with:
9292
user: __token__
9393
password: ${{ secrets.pypi_token }}

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setup(
99
name='pytest-describe',
10-
version='2.0.1',
10+
version='2.0.2',
1111
description='Describe-style plugin for pytest',
1212
long_description=readme,
1313
long_description_content_type='text/x-rst',
@@ -20,7 +20,7 @@
2020
license_file='LICENSE',
2121
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
2222
install_requires=[
23-
'pytest>=4.0.0',
23+
'pytest>=4.0,<7.1',
2424
],
2525
entry_points={
2626
'pytest11': [

tox.ini

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{36,37,38,39,py}-pytest_{4,50,51,52,53,54,60,61,62,latest,main},py{310}-pytest_{62,latest,main},flake8
2+
envlist = py{36,37,38,39,py}-pytest{4,50,51,52,53,54,60,61,62,70},py{310}-pytest{62,70},flake8
33

44
[testenv]
55
basepython =
@@ -8,24 +8,25 @@ basepython =
88
py38: python3.8
99
py39: python3.9
1010
py310: python3.10
11-
pypy: pypy3
11+
pypy: pypy3.9
1212
deps =
13-
pytest_4: pytest>=4.6,<5.0
14-
pytest_50: pytest>=5.0,<5.2
15-
pytest_51: pytest>=5.1,<5.2
16-
pytest_52: pytest>=5.2,<5.3
17-
pytest_53: pytest>=5.3,<5.4
18-
pytest_54: pytest>=5.4,<5.5
19-
pytest_60: pytest>=6.0,<6.1
20-
pytest_61: pytest>=6.1,<6.2
21-
pytest_62: pytest>=6.2,<6.3
22-
pytest_latest: pytest
23-
pytest_main: git+https://github.com/pytest-dev/pytest.git@main
13+
pytest4: pytest>=4.6,<5.0
14+
pytest50: pytest>=5.0,<5.2
15+
pytest51: pytest>=5.1,<5.2
16+
pytest52: pytest>=5.2,<5.3
17+
pytest53: pytest>=5.3,<5.4
18+
pytest54: pytest>=5.4,<5.5
19+
pytest60: pytest>=6.0,<6.1
20+
pytest61: pytest>=6.1,<6.2
21+
pytest62: pytest>=6.2,<6.3
22+
pytest70: pytest>=7.0,<7.1
23+
pytest-latest: pytest
24+
pytest-main: git+https://github.com/pytest-dev/pytest.git@main
2425
commands = pytest -rw {posargs}
2526

2627
[testenv:flake8]
2728
basepython = python3.9
28-
deps = flake8>=4,<5
29+
deps = flake8>=6,<7
2930
commands =
3031
flake8 pytest_describe test setup.py
3132

0 commit comments

Comments
 (0)