Merge pull request #504 from pytest-dev/python_update

Drop python 3.6, pytest<5

Author: youtux

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", 3.10.0-rc.2]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2

CHANGES.rst

@@ -10,6 +10,7 @@ This release introduces breaking changes in order to be more in line with the of
 - Removed feature level examples for the gherkin compatibility (olegpidsadnyi)
 - Removed vertical examples for the gherkin compatibility (olegpidsadnyi)
 - Step arguments are no longer fixtures (olegpidsadnyi)
+- Drop support of python 3.6, pytest 4 (elchupanebrej)
 
 
 

pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=42", "wheel"]
+requires = ["setuptools>=58", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 120
-target-version = ['py36', 'py37', 'py38']
+target-version = ["py37", "py38", "py39", "py310"]
 
 [tool.isort]
 profile = "black"

setup.cfg

@@ -19,20 +19,20 @@ 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 =
     glob2
     Mako
     parse
     parse_type
     py
-    pytest>=4.3
+    pytest>=5.0
 
 tests_require = tox
 packages = pytest_bdd

tests/scripts/test_generate.py

@@ -176,9 +176,6 @@ def test_unicode_characters(testdir, monkeypatch):
         ),
     )
 
-    if sys.version_info < (3, 7):
-        monkeypatch.setenv("PYTHONIOENCODING", "utf-8")
-
     result = testdir.run("pytest-bdd", "generate", "unicode_characters.feature")
     expected_output = textwrap.dedent(
         '''\

tox.ini

@@ -1,9 +1,12 @@
 [tox]
 distshare = {homedir}/.tox/distshare
-envlist = py38-pytestlatest-linters,
-          py39-pytest{43,44,45,46,50,51,52,53,54,60,61,62, latest}-coverage,
-          py{36,37,38,310}-pytestlatest-coverage,
-          py39-pytestlatest-xdist-coverage
+envlist = py310-pytestlatest-linters,
+          ; python 3.10 is only supported by pytest >= 6.2.5:
+          py310-pytest{62,70,latest}-coverage,
+          ; the rest of pytest runs need to use an older python:
+          py39-pytest{50,51,52,53,54,60,61}-coverage,
+          py{37,38,39}-pytestlatest-coverage,
+          py310-pytestlatest-xdist-coverage
 skip_missing_interpreters = true
 
 [testenv]
@@ -20,24 +23,18 @@ deps =
     pytest52: pytest~=5.2.0
     pytest51: pytest~=5.1.0
     pytest50: pytest~=5.0.0
-    pytest46: pytest~=4.6.0
-    pytest45: pytest~=4.5.0
-    pytest44: pytest~=4.4.0
-    pytest43: pytest~=4.3.0
 
     coverage: coverage
     xdist: pytest-xdist
     -r{toxinidir}/requirements-testing.txt
 commands = {env:_PYTEST_CMD:pytest} {env:_PYTEST_MORE_ARGS:} {posargs:-vvl}
 
-; Black doesn't support >py38 now
-[testenv:py38-pytestlatest-linters]
-deps = black
+[testenv:py310-pytestlatest-linters]
+deps = black==21.12b0
 commands = black --check --verbose setup.py docs pytest_bdd tests
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39