From b98e80cbb835b26d74de4514e2fff103b76af360 Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 9 Jul 2013 00:26:59 +0600 Subject: [PATCH] use tox deps instead of "manual" pip install; add lucid and precise environments to tox.ini --- .travis.yml | 1 + .travis/requirements-latest.txt | 1 - .travis/requirements-lucid.txt | 1 - .travis/requirements-precise.txt | 1 - tox.ini | 15 +++++++++++++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2012774a8..c14882249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ env: - BUILDENV=latest install: - pip install --use-mirrors -r .travis/requirements-$BUILDENV.txt + - pip install . script: - trial scrapy branches: diff --git a/.travis/requirements-latest.txt b/.travis/requirements-latest.txt index 576f2494e..585968196 100644 --- a/.travis/requirements-latest.txt +++ b/.travis/requirements-latest.txt @@ -3,4 +3,3 @@ lxml twisted boto Pillow -. diff --git a/.travis/requirements-lucid.txt b/.travis/requirements-lucid.txt index 20e601804..d55b57799 100644 --- a/.travis/requirements-lucid.txt +++ b/.travis/requirements-lucid.txt @@ -4,4 +4,3 @@ lxml==2.2.4 twisted==10.0.0 boto==1.9b Pillow<2.0 -. diff --git a/.travis/requirements-precise.txt b/.travis/requirements-precise.txt index 2bb99def0..276f7523b 100644 --- a/.travis/requirements-precise.txt +++ b/.travis/requirements-precise.txt @@ -4,4 +4,3 @@ lxml==2.3.2 twisted==11.1.0 boto==2.2.2 Pillow<2.0 -. diff --git a/tox.ini b/tox.ini index b97460c73..036c3148c 100644 --- a/tox.ini +++ b/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