Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
19 changes: 13 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
[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
pytest310: pytest~=3.10.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
Expand Down