From 86abf29a308004ca77645a8056987cbcba07cad0 Mon Sep 17 00:00:00 2001 From: Alessio Bogon Date: Wed, 7 Nov 2018 17:29:53 +0100 Subject: [PATCH 1/4] Drop support for 3.0 <= python < 3.4. Pytest also does not support them. Add support for 3.6 and 3.7. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5ecfce1..b70fc4b 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ "Topic :: Utilities", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3" - ] + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.0 3.1 3.2 3.3 3.4 3.5".split()], + ] + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.4 3.5 3.6 3.7".split()], install_requires=[ "inflection", "factory_boy>=2.10.0", From 7a6832d37bd90be76e376fcb87b022c0f8539743 Mon Sep 17 00:00:00 2001 From: Alessio Bogon Date: Wed, 7 Nov 2018 17:32:31 +0100 Subject: [PATCH 2/4] Travis&tox: test all supported pytest versions --- .travis.yml | 47 +++++++++++++++++++++++++++++++---------------- tox.ini | 20 ++++++++++++++------ 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4eb873..9d15e1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,37 @@ sudo: false language: python -# enable Python 3.5 on travis until it will be pre-installed -python: 3.5 -env: - matrix: - - TESTENV=py27-pytest2 - - TESTENV=py34-pytest2 - - TESTENV=py35-pytest2 - - TESTENV=py27-pytest3 - - TESTENV=py34-pytest3 - - TESTENV=py35-pytest3 +python: "2.7" + +matrix: + include: + - env: TOXENV=py27-pytest33 + - env: TOXENV=py27-pytest34 + - env: TOXENV=py27-pytest35 + - env: TOXENV=py27-pytest36 + - env: TOXENV=py27-pytest37 + - env: TOXENV=py27-pytest38 + - env: TOXENV=py27-pytest39 + - env: TOXENV=py27-pytest310 + - env: TOXENV=py27-pytestlatest + - env: TOXENV=py34-pytestlatest + python: "3.4" + - env: TOXENV=py35-pytestlatest + python: "3.5" + - env: TOXENV=py36-pytestlatest + python: "3.6" + - env: TOXENV=py37-pytestlatest + python: "3.7" + # Currently, python 3.7 is a little bit tricky to install: + # https://github.com/travis-ci/travis-ci/issues/9069#issuecomment-425720905 + sudo: required + dist: xenial install: - pip install tox -script: tox -e $TESTENV +script: tox branches: - except: - - /^\d/ + except: + - /^\d/ notifications: - email: - - bubenkoff@gmail.com - - oleg.pidsadnyi@gmail.com + email: + - bubenkoff@gmail.com + - oleg.pidsadnyi@gmail.com diff --git a/tox.ini b/tox.ini index 5906a41..389fb3d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,21 @@ [tox] distshare = {homedir}/.tox/distshare -envlist = py{27,34,35}-pytest{2,3} - +envlist = py27-pytest{33,34,35,36,37,38,39,310,latest},py{34,35,36,37}-pytestlatest [testenv] -commands = py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests} -deps = -r{toxinidir}/requirements-testing.txt - pytest2: pytest<3.0 - pytest3: pytest>3.0 +commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests} +deps = + pytestlatest: pytest + pytest39: pytest~=3.9.0 + pytest39: pytest~=3.9.0 + pytest39: pytest~=3.9.0 + pytest38: pytest~=3.8.0 + pytest37: pytest~=3.7.0 + pytest36: pytest~=3.6.0 + pytest35: pytest~=3.5.0 + pytest34: pytest~=3.4.0 + pytest33: pytest~=3.3.0 + -r{toxinidir}/requirements-testing.txt [pytest] addopts = -vv -l --pep8 From 6989d90f33dfc500d726fc9f75d366dbbe09bed9 Mon Sep 17 00:00:00 2001 From: Alessio Bogon Date: Wed, 7 Nov 2018 17:36:36 +0100 Subject: [PATCH 3/4] Actually test on pytest 3.10.x --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 389fb3d..50e423e 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,7 @@ envlist = py27-pytest{33,34,35,36,37,38,39,310,latest},py{34,35,36,37}-pytestlat commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests} deps = pytestlatest: pytest - pytest39: pytest~=3.9.0 - pytest39: pytest~=3.9.0 + pytest310: pytest~=3.10.0 pytest39: pytest~=3.9.0 pytest38: pytest~=3.8.0 pytest37: pytest~=3.7.0 From df13709dca8a700abce7dae1a85f762875557a04 Mon Sep 17 00:00:00 2001 From: Alessio Bogon Date: Fri, 9 Nov 2018 09:09:14 +0100 Subject: [PATCH 4/4] Remove coverage badge Coveralls integration was disabled in 2016 --- README.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.rst b/README.rst index b927c9f..03ff3ce 100644 --- a/README.rst +++ b/README.rst @@ -5,8 +5,6 @@ factory_boy_ integration with the pytest_ runner :target: https://pypi.python.org/pypi/pytest-factoryboy .. image:: https://img.shields.io/pypi/pyversions/pytest-factoryboy.svg :target: https://pypi.python.org/pypi/pytest-factoryboy -.. image:: https://img.shields.io/coveralls/pytest-dev/pytest-factoryboy/master.svg - :target: https://coveralls.io/r/pytest-dev/pytest-factoryboy .. image:: https://travis-ci.org/pytest-dev/pytest-factoryboy.svg?branch=master :target: https://travis-ci.org/pytest-dev/pytest-factoryboy .. image:: https://readthedocs.org/projects/pytest-factoryboy/badge/?version=latest