From 7530a4e2dfd401c6b6960731376e6bb6f3b0bf3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Skar=C5=BCy=C5=84ski?= Date: Wed, 23 Dec 2020 10:49:32 +0100 Subject: [PATCH 1/5] add python 3.9 to supported versions and remove 3.5 --- .travis.yml | 3 ++- pyproject.toml | 2 +- setup.py | 2 +- tox.ini | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd721f8..535aee4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,12 @@ +--- language: python dist: bionic python: - "2.7" - - "3.5" - "3.6" - "3.7" - "3.8" + - "3.9" install: - pip install tox tox-travis diff --git a/pyproject.toml b/pyproject.toml index 632eb80..ca79cf6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [tool.black] line-length = 120 -target-version = ['py27', 'py35', 'py36', 'py37', 'py38'] +target-version = ['py27', 'py36', 'py37', 'py38'] diff --git a/setup.py b/setup.py index c7006f4..24d8e6c 100755 --- a/setup.py +++ b/setup.py @@ -42,10 +42,10 @@ "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], install_requires=[ "inflection", diff --git a/tox.ini b/tox.ini index daa1bd5..b86c56e 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ distshare = {homedir}/.tox/distshare envlist = py27-pytest{43,44,45,46}, py38-pytest{43,44,45,46,50,51,52,53,54,60,latest}, py38-pytestlatest-linters, - py{35,36,37}-pytestlatest + py{36,37,39}-pytestlatest [testenv] commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests} From 07a42c747d12f933c0439b9672326dd3854a799e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Skar=C5=BCy=C5=84ski?= Date: Wed, 23 Dec 2020 10:50:26 +0100 Subject: [PATCH 2/5] support only officially maintained pytest versions --- setup.py | 2 +- tox.ini | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 24d8e6c..4be1b0d 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ install_requires=[ "inflection", "factory_boy>=2.10.0", - "pytest>=4.3", + "pytest>=4.6", 'funcsigs;python_version<"3.0"', ], # the following makes a plugin available to py.test diff --git a/tox.ini b/tox.ini index b86c56e..a8da5c8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] distshare = {homedir}/.tox/distshare -envlist = py27-pytest{43,44,45,46}, - py38-pytest{43,44,45,46,50,51,52,53,54,60,latest}, +envlist = py27-pytest46, + py38-pytest{46,54,60,61,62,latest,master}, py38-pytestlatest-linters, py{36,37,39}-pytestlatest @@ -9,16 +9,12 @@ envlist = py27-pytest{43,44,45,46}, commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests} deps = pytestlatest: pytest + pytestmaster: git+https://github.com/pytest-dev/pytest.git@master + pytest62: pytest~=6.2.0 + pytest61: pytest~=6.1.0 pytest60: pytest~=6.0.0 pytest54: pytest~=5.4.0 - pytest53: pytest~=5.3.0 - 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 -r{toxinidir}/requirements-testing.txt @@ -26,6 +22,10 @@ deps = deps = black commands = black --check --verbose setup.py pytest_factoryboy tests +[testenv:py38-pytestmaster] +# allow failures of tests run for `pytest` installed from `master` branch +ignore_outcome = true + [pytest] addopts = -vv -l pep8maxlinelength = 120 From c0e4118ac4b730f689adfafac50752e261d6bc99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Skar=C5=BCy=C5=84ski?= Date: Wed, 23 Dec 2020 10:51:05 +0100 Subject: [PATCH 3/5] remove invalid pytest ini option --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index a8da5c8..37fa299 100644 --- a/tox.ini +++ b/tox.ini @@ -28,4 +28,3 @@ ignore_outcome = true [pytest] addopts = -vv -l -pep8maxlinelength = 120 From 443a06daf4b73a46600444c4c133dadb5ef39740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Skar=C5=BCy=C5=84ski?= Date: Wed, 23 Dec 2020 11:49:53 +0100 Subject: [PATCH 4/5] add back pytest >=5.0,<5.4 to tox --- tox.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 37fa299..42477aa 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] distshare = {homedir}/.tox/distshare envlist = py27-pytest46, - py38-pytest{46,54,60,61,62,latest,master}, + py38-pytest{46,50,51,52,53,54,60,61,62,latest,master}, py38-pytestlatest-linters, py{36,37,39}-pytestlatest @@ -14,6 +14,10 @@ deps = pytest61: pytest~=6.1.0 pytest60: pytest~=6.0.0 pytest54: pytest~=5.4.0 + pytest53: pytest~=5.3.0 + 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 From 806d4ae1061b92d6ab8ff89b7a6cf1418569a246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Skar=C5=BCy=C5=84ski?= Date: Wed, 23 Dec 2020 11:52:51 +0100 Subject: [PATCH 5/5] update CHANGES.md --- CHANGES.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index de4cfe5..8829160 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,8 +4,10 @@ Changelog Unreleased ---------- -- Drop support for Python 3.4. -- Drop support for pytest < 4.3. +- Add support for Python 3.9. +- Drop support for Python 3.4, 3.5. +- Add support for pytest 6. +- Drop support for pytest < 4.6. 2.0.3