8000 Update our tox and travis configuration files · pythonthings/github3.py@a5ea3c7 · GitHub
[go: up one dir, main page]
Skip to content

Commit a5ea3c7

Browse files
sigmavirus24sigmavirus24
committed
Update our tox and travis configuration files
1 parent 0ce9a93 commit a5ea3c7

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

‎.travis.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ before_script:
44
- pip install -U requests"$REQUESTS_VERSION"
55

66
# test script
7-
script: tox -e ${TOX_ENV}
7+
script: tox
88
notifications:
99
on_success: change
1010
on_failure: always
@@ -13,27 +13,27 @@ env:
1313
global:
1414
- TRAVIS_GH3="True"
1515
matrix:
16-
- TOX_ENV=py26 REQUESTS_VERSION="==2.0.1"
17-
- TOX_ENV=py27 REQUESTS_VERSION="==2.0.1"
18-
- TOX_ENV=py32 REQUESTS_VERSION="==2.0.1"
19-
- TOX_ENV=py33 REQUESTS_VERSION="==2.0.1"
20-
- TOX_ENV=py34 REQUESTS_VERSION="==2.0.1"
21-
- TOX_ENV=pypy REQUESTS_VERSION="==2.0.1"
22-
- TOX_ENV=py26 REQUESTS_VERSION=""
23-
- TOX_ENV=py27 REQUESTS_VERSION=""
24-
- TOX_ENV=py32 REQUESTS_VERSION=""
25-
- TOX_ENV=py33 REQUESTS_VERSION=""
26-
- TOX_ENV=py34 REQUESTS_VERSION=""
27-
- TOX_ENV=pypy REQUESTS_VERSION=""
28-
- TOX_ENV=py27-flake8
29-
- TOX_ENV=py34-flake8
30-
- TOX_ENV=docstrings
31-
- TOX_ENV=notebooks
16+
- TOXENV=py26 REQUESTS_VERSION="===2.0.1"
17+
- TOXENV=py27 REQUESTS_VERSION="===2.0.1"
18+
- TOXENV=py32 REQUESTS_VERSION="===2.0.1"
19+
- TOXENV=py33 REQUESTS_VERSION="===2.0.1"
20+
- TOXENV=py34 REQUESTS_VERSION="===2.0.1"
21+
- TOXENV=pypy REQUESTS_VERSION="===2.0.1"
22+
- TOXENV=py26 REQUESTS_VERSION=""
23+
- TOXENV=py27 REQUESTS_VERSION=""
24+
- TOXENV=py32 REQUESTS_VERSION=""
25+
- TOXENV=py33 REQUESTS_VERSION=""
26+
- TOXENV=py34 REQUESTS_VERSION=""
27+
- TOXENV=pypy REQUESTS_VERSION=""
28+
- TOXENV=py27-flake8
29+
- TOXENV=py34-flake8
30+
- TOXENV=docstrings
31+
- TOXENV=notebooks
3232

3333
matrix:
3434
fast_finish: true
3535
allow_failures:
36-
- env: TOX_ENV=docstrings
37-
- env: TOX_ENV=notebooks
36+
- env: TOXENV=docstrings
37+
- env: TOXENV=notebooks
3838

3939
sudo: false

‎tox.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ envlist = py26,py27,py32,py33,py34,pypy,{py27,py34}-flake8,docstrings
44
[testenv]
55
pip_pre = False
66
deps =
7-
-rdev-requirements.txt
7+
requests{env:REQUESTS_VERSION:>=2.0}
8+
mock==1.0.1
9+
pytest>=2.3.5
10+
betamax>=0.5.1
11+
betamax_matchers>=0.2.0
812
pypy,py26,py27: unittest2
913
commands = py.test {posargs}
1014

0 commit comments

Comments
 (0)
0