Skip to content

Commit 2f06b1b

Browse files
authored
Update required python version and update test/CI config (#72)
* Drop support for 3.0 <= python < 3.4. Pytest also does not support them. Add support for 3.6 and 3.7. * Travis&tox: test all supported pytest versions * Actually test on pytest 3.10.x * Remove coverage badge Coveralls integration was disabled in 2016
1 parent 3b02faf commit 2f06b1b

File tree

4 files changed

+45
-25
lines changed

4 files changed

+45
-25
lines changed

.travis.yml

+31-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,37 @@
11
sudo: false
22
language: python
3-
# enable Python 3.5 on travis until it will be pre-installed
4-
python: 3.5
5-
env:
6-
matrix:
7-
- TESTENV=py27-pytest2
8-
- TESTENV=py34-pytest2
9-
- TESTENV=py35-pytest2
10-
- TESTENV=py27-pytest3
11-
- TESTENV=py34-pytest3
12-
- TESTENV=py35-pytest3
3+
python: "2.7"
4+
5+
matrix:
6+
include:
7+
- env: TOXENV=py27-pytest33
8+
- env: TOXENV=py27-pytest34
9+
- env: TOXENV=py27-pytest35
10+
- env: TOXENV=py27-pytest36
11+
- env: TOXENV=py27-pytest37
12+
- env: TOXENV=py27-pytest38
13+
- env: TOXENV=py27-pytest39
14+
- env: TOXENV=py27-pytest310
15+
- env: TOXENV=py27-pytestlatest
16+
- env: TOXENV=py34-pytestlatest
17+
python: "3.4"
18+
- env: TOXENV=py35-pytestlatest
19+
python: "3.5"
20+
- env: TOXENV=py36-pytestlatest
21+
python: "3.6"
22+
- env: TOXENV=py37-pytestlatest
23+
python: "3.7"
24+
# Currently, python 3.7 is a little bit tricky to install:
25+
# https://github.com/travis-ci/travis-ci/issues/9069#issuecomment-425720905
26+
sudo: required
27+
dist: xenial
1328
install:
1429
- pip install tox
15-
script: tox -e $TESTENV
30+
script: tox
1631
branches:
17-
except:
18-
- /^\d/
32+
except:
33+
- /^\d/
1934
notifications:
20-
email:
21-
22-
35+
email:
36+
37+

README.rst

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ factory_boy_ integration with the pytest_ runner
55
:target: https://pypi.python.org/pypi/pytest-factoryboy
66
.. image:: https://img.shields.io/pypi/pyversions/pytest-factoryboy.svg
77
:target: https://pypi.python.org/pypi/pytest-factoryboy
8-
.. image:: https://img.shields.io/coveralls/pytest-dev/pytest-factoryboy/master.svg
9-
:target: https://coveralls.io/r/pytest-dev/pytest-factoryboy
108
.. image:: https://travis-ci.org/pytest-dev/pytest-factoryboy.svg?branch=master
119
:target: https://travis-ci.org/pytest-dev/pytest-factoryboy
1210
.. image:: https://readthedocs.org/projects/pytest-factoryboy/badge/?version=latest

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"Topic :: Utilities",
3939
"Programming Language :: Python :: 2",
4040
"Programming Language :: Python :: 3"
41-
] + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.0 3.1 3.2 3.3 3.4 3.5".split()],
41+
] + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.4 3.5 3.6 3.7".split()],
4242
install_requires=[
4343
"inflection",
4444
"factory_boy>=2.10.0",

tox.ini

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
[tox]
22
distshare = {homedir}/.tox/distshare
3-
envlist = py{27,34,35}-pytest{2,3}
4-
3+
envlist = py27-pytest{33,34,35,36,37,38,39,310,latest},py{34,35,36,37}-pytestlatest
54

65
[testenv]
7-
commands = py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests}
8-
deps = -r{toxinidir}/requirements-testing.txt
9-
pytest2: pytest<3.0
10-
pytest3: pytest>3.0
6+
commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests}
7+
deps =
8+
pytestlatest: pytest
9+
pytest310: pytest~=3.10.0
10+
pytest39: pytest~=3.9.0
11+
pytest38: pytest~=3.8.0
12+
pytest37: pytest~=3.7.0
13+
pytest36: pytest~=3.6.0
14+
pytest35: pytest~=3.5.0
15+
pytest34: pytest~=3.4.0
16+
pytest33: pytest~=3.3.0
17+
-r{toxinidir}/requirements-testing.txt
1118

1219
[pytest]
1320
addopts = -vv -l --pep8

0 commit comments

Comments
 (0)