diff --git a/.travis.yml b/.travis.yml index 9b34bc3aa..10efe11ff 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 notifications: diff --git a/.travis/requirements-latest.txt b/.travis/requirements-latest.txt index 576f2494e..15dd8936f 100644 --- a/.travis/requirements-latest.txt +++ b/.travis/requirements-latest.txt @@ -3,4 +3,4 @@ lxml twisted boto Pillow -. +django 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..625708aa2 100644 --- a/.travis/requirements-precise.txt +++ b/.travis/requirements-precise.txt @@ -4,4 +4,4 @@ lxml==2.3.2 twisted==11.1.0 boto==2.2.2 Pillow<2.0 -. +django==1.3.1 diff --git a/scrapy/tests/test_djangoitem/settings.py b/scrapy/tests/test_djangoitem/settings.py index e3300db9d..1bee92477 100644 --- a/scrapy/tests/test_djangoitem/settings.py +++ b/scrapy/tests/test_djangoitem/settings.py @@ -4,3 +4,5 @@ DATABASES = { 'NAME': ':memory:', } } + +SECRET_KEY = 'top-secret' diff --git a/tox.ini b/tox.ini index 157c0c217..9f0e77753 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,24 @@ # 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 scrapy + {toxinidir}/bin/runtests.sh [] + +[testenv:lucid] +basepython = python2.6 +deps = + -r{toxinidir}/.travis/requirements-lucid.txt + +[testenv:precise] +basepython = python2.7 +deps = + -r{toxinidir}/.travis/requirements-precise.txt + +[testenv:windows] +commands = + {toxinidir}/bin/runtests.bat []