Skip to content

Commit

Permalink
Test with pytest from master/features
Browse files Browse the repository at this point in the history
Fix #76
  • Loading branch information
nicoddemus committed Aug 31, 2017
1 parent 00ab02e commit 6901640
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 27 deletions.
54 changes: 32 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,48 @@
sudo: false
language: python
python:
- '2.6'
- '2.7'
- '3.3'
- '3.4'
- '3.5'
- '3.6'
- pypy
- nightly

# command to install dependencies
install: "pip install -U tox"

# command to run tests
env:
matrix:
- TOXENV=py-pytest28
- TOXENV=py-pytest29
- TOXENV=py-pytest30

matrix:
include:
- python: '2.6'
env: TOXENV=py26
- python: '2.7'
env: TOXENV=check
env: TOXENV=py27
- python: '3.3'
env: TOXENV=py33
- python: '3.4'
env: TOXENV=py34
- python: '3.5'
env: TOXENV=py35
- python: '3.6'
env: TOXENV=check
env: TOXENV=py36
- python: 'pypy'
env: TOXENV=pypy
- python: 'nightly'
env: TOXENV=py37
- python: '2.7'
env: TOXENV=benchmark
- python: '3.6'
env: TOXENV=benchmark
- python: '2.7'
env: TOXENV=check
- python: '3.6'
env: TOXENV=check
- python: '3.6'
env: TOXENV=docs
- python: '2.7'
env: TOXENV=pytest-master
- python: '3.6'
env: TOXENV=pytest-master
- python: '2.7'
env: TOXENV=pytest-features
- python: '3.6'
env: TOXENV=pytest-features

install:
- pip install -U tox

script:
- tox --recreate -e $TOXENV
- tox

notifications:
irc:
Expand Down
16 changes: 15 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
environment:
matrix:
# note: please use "tox --listenvs" to populate the build matrix below
- TOXENV: "check"
- TOXENV: "py26"
- TOXENV: "py27"
- TOXENV: "py34"
- TOXENV: "py35"
- TOXENV: "py36"
- TOXENV: "pypy"
# non-default tox environments
- TOXENV: "check"
- TOXENV: "docs"
- TOXENV: "pytest-master"
- TOXENV: "pytest-features"

install:
- echo Installed Pythons
Expand All @@ -18,4 +33,3 @@ build: false # Not a C# project, build stuff at the test step instead.

test_script:
- C:\Python35\python -m tox

16 changes: 12 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
[tox]
envlist=check,py{26,27,34,35,36,py}-pytest{28,29,30}
envlist=check,py{26,27,34,35,36,py}

[testenv]
commands=py.test {posargs:testing/}
deps=
pytest28: pytest~=2.8.0
pytest29: pytest~=2.9.0
pytest30: pytest~=3.0.0
pytest

[testenv:pytest-master]
commands=py.test {posargs:testing/}
deps=
git+https://github.com/pytest-dev/pytest.git@master

[testenv:pytest-features]
commands=py.test {posargs:testing/}
deps=
git+https://github.com/pytest-dev/pytest.git@features

[testenv:benchmark]
commands=py.test {posargs:testing/benchmark.py}
Expand Down

0 comments on commit 6901640

Please sign in to comment.