Skip to content

Test pytest 3.1 and master on CI #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Test pytest 3.1 and master on CI #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ python:
install: pip install tox-travis setuptools_scm
matrix:
include:
# note: please use "tox --listenvs" to populate the build matrix
- python: "3.5"
- python: "3.6"
env: TOXENV=flakes
- python: "3.5"
- python: "3.6"
env: TOXENV=readme

script: tox
Expand Down
18 changes: 14 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,29 @@ environment:
matrix:
# note: please use "tox --listenvs" to populate the build matrix
- TOXENV: "py26-pytest30"
- TOXENV: "py26-pytest31"
- TOXENV: "py26-pytestmaster"
- TOXENV: "py27-pytest30"
- TOXENV: "py27-pytest31"
- TOXENV: "py27-pytestmaster"
- TOXENV: "py34-pytest30"
- TOXENV: "py34-pytest31"
- TOXENV: "py34-pytestmaster"
- TOXENV: "py35-pytest30"
- TOXENV: "py35-pytest31"
- TOXENV: "py35-pytestmaster"
- TOXENV: "py36-pytest30"
- TOXENV: "py27-pytest30-pexpect"
- TOXENV: "py35-pytest30-pexpect"
- TOXENV: "py36-pytest31"
- TOXENV: "py36-pytestmaster"
- TOXENV: "py27-pytest31-pexpect"
- TOXENV: "py35-pytest31-pexpect"
- TOXENV: "flakes"
- TOXENV: "readme"

install:
- C:\Python35\python -m pip install tox setuptools_scm
- C:\Python36\python -m pip install tox setuptools_scm

build: false # Not a C# project, build stuff at the test step instead.

test_script:
- C:\Python35\python -m tox
- C:\Python36\python -m tox
8 changes: 5 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
# if you change the envlist, please update .travis.yml file as well
envlist=
py{26,27,34,35,36}-pytest{30}
py{27,35}-pytest{30}-pexpect
py{26,27,34,35,36}-pytest{30,31,master}
py{27,35}-pytest{31}-pexpect
flakes
readme

Expand All @@ -14,7 +14,9 @@ deps =
pycmd
# to avoid .eggs
setuptools_scm
pytest30: pytest~=3.0.5
pytest30: pytest~=3.0.0
pytest31: pytest~=3.1.0
pytestmaster: git+https://github.com/pytest-dev/pytest@master
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is a good idea or not, thought I would open the PR directly instead of raising an issue;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the one for pytestmaster should be a own stage and use a cronjob

pexpect: pexpect
platform=
pexpect: linux|darwin
Expand Down