Skip to content

Commit 3f97f01

Browse files
committed
BLD Simplified travis matrix.
1 parent be66f4e commit 3f97f01

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

.travis.yml

+4-15
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,12 @@ services:
66
- redis-server
77

88
env:
9-
- TOXENV=py27-scrapy10
10-
- TOXENV=py27-scrapy11
11-
- TOXENV=py27-scrapy12
12-
- TOXENV=py27-scrapydev
13-
- TOXENV=py34-scrapy11
14-
- TOXENV=py34-scrapy12
15-
- TOXENV=py34-scrapydev
16-
- TOXENV=py35-scrapy11
17-
- TOXENV=py35-scrapy12
18-
- TOXENV=py35-scrapydev
9+
- TOXENV=py27-scrapyrel
10+
- TOXENV=py34-scrapyrel
11+
- TOXENV=py35-scrapyrel
1912

2013
matrix:
2114
fast_finish: true
22-
allow_failures:
23-
- env: TOXENV=py27-scrapydev
24-
- env: TOXENV=py34-scrapydev
25-
- env: TOXENV=py35-scrapydev
2615

2716
before_install:
2817
- python --version
@@ -76,4 +65,4 @@ deploy:
7665
tags: true
7766
all_branches: true
7867
repo: rolando/scrapy-redis
79-
condition: "$TOXENV == py35-scrapy12"
68+
condition: "$TOXENV == py35-scrapyrel"

tox.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
# TODO: added redis-py version matrix.
3-
envlist = py{27,34,35}-scrapy{10,11,12,1x,dev}
3+
envlist = py{27,34,35}-scrapy{10,11,12,1x,rel,dev}
44

55
[testenv]
66
basepython =
@@ -16,5 +16,6 @@ commands =
1616
scrapy11: pip install scrapy>=1.1,<1.2
1717
scrapy12: pip install scrapy>=1.2,<1.3
1818
scrapy1x: pip install scrapy>=1.0,<2.0
19+
scrapyrel: pip install scrapy
1920
scrapydev: pip install https://github.com/scrapy/scrapy/archive/master.zip
2021
{posargs:coverage run -m py.test}

0 commit comments

Comments
 (0)