mirror of https://github.com/scrapy/scrapy.git
use tox deps instead of "manual" pip install; add lucid and precise environments to tox.ini
This commit is contained in:
parent
35fbec2e63
commit
b98e80cbb8
|
|
@ -8,6 +8,7 @@ env:
|
|||
- BUILDENV=latest
|
||||
install:
|
||||
- pip install --use-mirrors -r .travis/requirements-$BUILDENV.txt
|
||||
- pip install .
|
||||
script:
|
||||
- trial scrapy
|
||||
branches:
|
||||
|
|
|
|||
|
|
@ -3,4 +3,3 @@ lxml
|
|||
twisted
|
||||
boto
|
||||
Pillow
|
||||
.
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@ lxml==2.2.4
|
|||
twisted==10.0.0
|
||||
boto==1.9b
|
||||
Pillow<2.0
|
||||
.
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@ lxml==2.3.2
|
|||
twisted==11.1.0
|
||||
boto==2.2.2
|
||||
Pillow<2.0
|
||||
.
|
||||
|
|
|
|||
15
tox.ini
15
tox.ini
|
|
@ -4,9 +4,20 @@
|
|||
# and then run "tox" from this directory.
|
||||
|
||||
[tox]
|
||||
envlist = py26, py27
|
||||
envlist = py26, py27, lucid, precise
|
||||
|
||||
[testenv]
|
||||
deps =
|
||||
-r{toxinidir}/.travis/requirements-latest.txt
|
||||
commands =
|
||||
pip install --use-mirrors -r .travis/requirements-latest.txt
|
||||
trial {posargs:scrapy}
|
||||
|
||||
[testenv:lucid]
|
||||
basepython = python2.6
|
||||
deps =
|
||||
-r{toxinidir}/.travis/requirements-lucid.txt
|
||||
|
||||
[testenv:precise]
|
||||
basepython = python2.7
|
||||
deps =
|
||||
-r{toxinidir}/.travis/requirements-precise.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue