Skip to content

Commit 59d3ad0

Browse files
authored
Merge pull request #61 from redapple/tox-travis-generative-envlist
Use tox's generative envlist
2 parents f63a8bc + e3516dc commit 59d3ad0

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@ matrix:
66
- python: 2.7
77
env: TOXENV=py27
88
- python: 2.7
9-
env: TOXENV=py27-scrapy1.0.x
9+
env: TOXENV=py27-scrapy1.0
10+
- python: 2.7
11+
env: TOXENV=py27-scrapy1.1
12+
- python: 2.7
13+
env: TOXENV=py27-scrapy1.2
1014
- python: 3.5
1115
env: TOXENV=py35
1216
- python: 3.6
1317
env: TOXENV=py36
14-
18+
- python: 3.6
19+
env: TOXENV=py36-scrapy1.1
20+
- python: 3.6
21+
env: TOXENV=py36-scrapy1.2
1522
script: tox
1623

1724
deploy:

tox.ini

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
[tox]
2-
envlist = py27, py27-scrapy1.0.x, py35, py36
3-
4-
[testenv]
5-
deps =
6-
-r{toxinidir}/requirements.txt
7-
-r{toxinidir}/requirements-dev.txt
8-
commands = py.test {posargs}
9-
10-
[testenv:py27-scrapy1.0.x]
11-
deps =
12-
Scrapy<1.1
13-
-r{toxinidir}/requirements-dev.txt
1+
[tox]
2+
envlist = py27, py27-scrapy{1.0,1.1,1.2}, py35, py36, {py35,py36}-scrapy{1.1,1.2}
3+
4+
[testenv]
5+
deps =
6+
scrapy1.0: Scrapy>=1.0,<1.1
7+
scrapy1.1: Scrapy>=1.1,<1.2
8+
scrapy1.2: Scrapy>=1.2,<1.3
9+
-r{toxinidir}/requirements-dev.txt
10+
commands = py.test {posargs}

0 commit comments

Comments
 (0)