Skip to content

tox.ini: Bring over changes from 1.0-alpha branch #293

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

Merged
merged 2 commits into from
Nov 1, 2014
Merged

tox.ini: Bring over changes from 1.0-alpha branch #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d0b6a3
tox.ini: Bring over changes from 1.0-alpha branch
msabramo Nov 1, 2014
260cb49
.travis.yml: Bring over changes from 1.0-alpha branch
msabramo Nov 1, 2014
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
37 changes: 23 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
language: python
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- pypy
# command to run tests, e.g. python setup.py test
before_script:
- pip install -r dev-requirements.txt
- pip install tox
- pip install -U requests"$REQUESTS_VERSION"

# test script
script: make travis
script: tox -e ${TOX_ENV}
notifications:
on_success: change
on_failure: always
on_success: change
on_failure: always

env:
global:
- TRAVIS_GH3="True"
matrix:
- REQUESTS_VERSION="==2.0.1"
- REQUESTS_VERSION="" # Latest
- TOX_ENV=py26 REQUESTS_VERSION="==2.0.1"
- TOX_ENV=py27 REQUESTS_VERSION="==2.0.1"
- TOX_ENV=py32 REQUESTS_VERSION="==2.0.1"
- TOX_ENV=py33 REQUESTS_VERSION="==2.0.1"
- TOX_ENV=py34 REQUESTS_VERSION="==2.0.1"
- TOX_ENV=pypy REQUESTS_VERSION="==2.0.1"
- TOX_ENV=py26 REQUESTS_VERSION=""
- TOX_ENV=py27 REQUESTS_VERSION=""
- TOX_ENV=py32 REQUESTS_VERSION=""
- TOX_ENV=py33 REQUESTS_VERSION=""
- TOX_ENV=py34 REQUESTS_VERSION=""
- TOX_ENV=pypy REQUESTS_VERSION=""
- TOX_ENV=py27-flake8
- TOX_ENV=py34-flake8

matrix:
allow_failures:
- env: TOX_ENV=py27-flake8
- env: TOX_ENV=py34-flake8
48 changes: 35 additions & 13 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,42 @@
[tox]
envlist = py26,py27,py32,py33,py34
envlist = py26,py27,py32,py33,py34,pypy,{py27,py34}-flake8

[testenv]
deps =
requests>=1.2.3
coverage>=3.5.2
mock>=1.0.1
commands =
python setup.py test
pip_pre = False
deps = -rdev-requirements.txt
commands = py.test

[testenv:pypy]
deps =
-rdev-requirements.txt
unittest2
commands = py.test

[testenv:py26]
deps =
requests>=1.2.3
coverage>=3.5.2
mock>=1.0.1
commands =
python setup.py test
deps =
-rdev-requirements.txt
unittest2
commands = py.test

[testenv:py27]
deps =
-rdev-requirements.txt
unittest2
commands = py.test

[testenv:py27-flake8]
basepython = python2.7
deps =
flake8
flake8-docstrings
commands = flake8 github3/

[testenv:py34-flake8]
basepython = python3.4
deps =
flake8
flake8-docstrings
commands = flake8 github3/

[pytest]
addopts = -q tests/