Skip to content

Commit b05dbe0

Browse files
author
Konstantin Goloveshko
committed
Update python environment
- Drop python 3.6 because of EOL - Drop pytest<5 (Actually there wasn't reason to support 4.x version because they are about 3.4/2.7 python support, which already dropped) - Fix source distribution build
1 parent 2fb5a11 commit b05dbe0

File tree

5 files changed

+14
-20
lines changed

5 files changed

+14
-20
lines changed

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This release introduces breaking changes in order to be more in line with the of
1010
- Removed feature level examples for the gherkin compatibility (olegpidsadnyi)
1111
- Removed vertical examples for the gherkin compatibility (olegpidsadnyi)
1212
- Step arguments are no longer fixtures (olegpidsadnyi)
13+
- Drop support of python 3.6, pytest 4
1314

1415

1516

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[build-system]
2-
requires = ["setuptools>=42", "wheel"]
2+
requires = ["setuptools>=58", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.black]
66
line-length = 120
7-
target-version = ['py36', 'py37', 'py38']
7+
target-version = ['py37', 'py38', 'py39', 'py310']
88

99
[tool.isort]
1010
profile = "black"

setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ classifiers =
1919
Topic :: Software Development :: Libraries
2020
Topic :: Utilities
2121
Programming Language :: Python :: 3
22-
Programming Language :: Python :: 3.6
2322
Programming Language :: Python :: 3.7
2423
Programming Language :: Python :: 3.8
2524
Programming Language :: Python :: 3.9
25+
Programming Language :: Python :: 3.10
2626

2727
[options]
28-
python_requires = >=3.6
28+
python_requires = >=3.7
2929
install_requires =
3030
glob2
3131
Mako
3232
parse
33-
parse_type
33+
parse_type>=0.6.0
3434
py
35-
pytest>=4.3
35+
pytest>=5.0
3636

3737
tests_require = tox
3838
packages = pytest_bdd

tests/scripts/test_generate.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,6 @@ def test_unicode_characters(testdir, monkeypatch):
176176
),
177177
)
178178

179-
if sys.version_info < (3, 7):
180-
monkeypatch.setenv("PYTHONIOENCODING", "utf-8")
181-
182179
result = testdir.run("pytest-bdd", "generate", "unicode_characters.feature")
183180
expected_output = textwrap.dedent(
184181
'''\

tox.ini

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[tox]
22
distshare = {homedir}/.tox/distshare
3-
envlist = py38-pytestlatest-linters,
4-
py39-pytest{43,44,45,46,50,51,52,53,54,60,61,62, latest}-coverage,
5-
py{36,37,38,310}-pytestlatest-coverage,
6-
py39-pytestlatest-xdist-coverage
3+
envlist = py310-pytestlatest-linters,
4+
py310-pytest{625, latest}-coverage,
5+
py39-pytest{50,51,52,53,54,60,61,62}-coverage,
6+
py{37,38,39}-pytestlatest-coverage,
7+
py310-pytestlatest-xdist-coverage
78
skip_missing_interpreters = true
89

910
[testenv]
@@ -12,6 +13,7 @@ setenv =
1213
xdist: _PYTEST_MORE_ARGS=-n3 -rfsxX
1314
deps =
1415
pytestlatest: pytest
16+
pytest625: pytest~=6.2.5
1517
pytest62: pytest~=6.2.0
1618
pytest61: pytest~=6.1.0
1719
pytest60: pytest~=6.0.0
@@ -20,24 +22,18 @@ deps =
2022
pytest52: pytest~=5.2.0
2123
pytest51: pytest~=5.1.0
2224
pytest50: pytest~=5.0.0
23-
pytest46: pytest~=4.6.0
24-
pytest45: pytest~=4.5.0
25-
pytest44: pytest~=4.4.0
26-
pytest43: pytest~=4.3.0
2725

2826
coverage: coverage
2927
xdist: pytest-xdist
3028
-r{toxinidir}/requirements-testing.txt
3129
commands = {env:_PYTEST_CMD:pytest} {env:_PYTEST_MORE_ARGS:} {posargs:-vvl}
3230

33-
; Black doesn't support >py38 now
34-
[testenv:py38-pytestlatest-linters]
31+
[testenv:py310-pytestlatest-linters]
3532
deps = black
3633
commands = black --check --verbose setup.py docs pytest_bdd tests
3734

3835
[gh-actions]
3936
python =
40-
3.6: py36
4137
3.7: py37
4238
3.8: py38
4339
3.9: py39

0 commit comments

Comments
 (0)