diff --git a/.travis.yml b/.travis.yml index bb3d3720..a9b03f14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ python: "2.7" matrix: include: - python: "2.7" - env: TOXENV=py27-pytestlatest-linters + # env: TOXENV=py27-pytestlatest-linters + env: TOXENV=py27-pytest44-linters - env: TOXENV=py27-pytest33 - env: TOXENV=py27-pytest34 - env: TOXENV=py27-pytest35 @@ -17,17 +18,30 @@ matrix: - env: TOXENV=py27-pytest40 - env: TOXENV=py27-pytest41 - env: TOXENV=py27-pytest42 - - env: TOXENV=py27-pytestlatest - - env: TOXENV=py27-pytestlatest-xdist - - env: TOXENV=py34-pytestlatest + - env: TOXENV=py27-pytest43 + - env: TOXENV=py27-pytest44 + - env: TOXENV=py27-pytest45 + # - env: TOXENV=py27-pytestlatest + # - env: TOXENV=py27-pytestlatest-xdist + # - 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" + - env: TOXENV=py27-pytest44-xdist + - env: TOXENV=py34-pytest44 python: "3.4" - - env: TOXENV=py35-pytestlatest + - env: TOXENV=py35-pytest44 python: "3.5" - - env: TOXENV=py36-pytestlatest + - env: TOXENV=py36-pytest44 python: "3.6" - - env: TOXENV=py37-pytestlatest + - env: TOXENV=py37-pytest44 python: "3.7" - - env: TOXENV=py27-pytestlatest-coveralls + - env: TOXENV=py27-pytest44-coveralls + # - env: TOXENV=py27-pytestlatest-coveralls install: - make translate diff --git a/tox.ini b/tox.ini index a0a2696d..ffea802a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,14 @@ [tox] distshare={homedir}/.tox/distshare -envlist=py27-pytestlatest-linters,py27-pytest{33,34,35,36,37,38,39,310,40,41,42,latest},py{34,35,36,37}-pytestlatest,py27-pytestlatest-xdist +envlist=py27-pytest{latest,44}-{linters,xdist},py27-pytest{33,34,35,36,37,38,39,310,40,41,42,43,44,45,latest},py{34,35,36,37}-pytest{latest,44} skip_missing_interpreters = true [testenv] deps = pytestlatest: pytest + pytest45: pytest~=4.5.0 + pytest44: pytest~=4.4.0 + pytest43: pytest~=4.3.0 pytest42: pytest~=4.2.0 pytest41: pytest~=4.1.0 pytest40: pytest~=4.0.0 @@ -20,16 +23,16 @@ deps = -r{toxinidir}/requirements-testing.txt commands = py.test tests --junitxml={envlogdir}/junit-{envname}.xml -[testenv:py27-pytestlatest-linters] +[testenv:py27-pytest{latest,44}-linters] commands={[testenv]commands} pytest_bdd --pep8 -m pep8 -[testenv:py27-pytestlatest-xdist] +[testenv:py27-pytest{latest,44}-xdist] deps = pytest-xdist {[testenv]deps} commands={[testenv]commands} -n3 -rfsxX -[testenv:py27-pytestlatest-coveralls] +[testenv:py27-pytest{latest,44}-coveralls] passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH usedevelop = True changedir = .