From 35fbec2e63d12ce6651ad3000e304cc5e4e8a43b Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Mon, 8 Jul 2013 22:51:03 +0600 Subject: [PATCH 1/6] allow passing arguments to tox e.g. "tox -- scrapy.tests.test_contrib_loader" runs test_contrib_loader for Python 2.6 and 2.7 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 157c0c217..b97460c73 100644 --- a/tox.ini +++ b/tox.ini @@ -9,4 +9,4 @@ envlist = py26, py27 [testenv] commands = pip install --use-mirrors -r .travis/requirements-latest.txt - trial scrapy + trial {posargs:scrapy} From b98e80cbb835b26d74de4514e2fff103b76af360 Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 9 Jul 2013 00:26:59 +0600 Subject: [PATCH 2/6] 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 From 2105ec58eb63d4ac30317c59b5cd21afdad0341d Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 9 Jul 2013 00:28:39 +0600 Subject: [PATCH 3/6] add django to test requirements and fix test_djangoitem for modern django versions --- .travis/requirements-latest.txt | 1 + .travis/requirements-precise.txt | 1 + scrapy/tests/test_djangoitem/settings.py | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.travis/requirements-latest.txt b/.travis/requirements-latest.txt index 585968196..15dd8936f 100644 --- a/.travis/requirements-latest.txt +++ b/.travis/requirements-latest.txt @@ -3,3 +3,4 @@ lxml twisted boto Pillow +django diff --git a/.travis/requirements-precise.txt b/.travis/requirements-precise.txt index 276f7523b..625708aa2 100644 --- a/.travis/requirements-precise.txt +++ b/.travis/requirements-precise.txt @@ -4,3 +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' From 3a6dff3090e9fa9b46cd64b7702d6dd9f8e95acc Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 9 Jul 2013 00:30:39 +0600 Subject: [PATCH 4/6] make tox test running more consistent with bin/runtests.sh script --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 036c3148c..f06c7b840 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ envlist = py26, py27, lucid, precise deps = -r{toxinidir}/.travis/requirements-latest.txt commands = - trial {posargs:scrapy} + trial {posargs:--reporter=text scrapy} [testenv:lucid] basepython = python2.6 From f29e5d0ca121e183174d17d59aac6d65984a92e7 Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 9 Jul 2013 00:38:00 +0600 Subject: [PATCH 5/6] reuse runtests.sh and runtests.bat scripts in tox.ini --- tox.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f06c7b840..ddfc69371 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ envlist = py26, py27, lucid, precise deps = -r{toxinidir}/.travis/requirements-latest.txt commands = - trial {posargs:--reporter=text scrapy} + {toxinidir}/bin/runtests.sh [testenv:lucid] basepython = python2.6 @@ -21,3 +21,7 @@ deps = basepython = python2.7 deps = -r{toxinidir}/.travis/requirements-precise.txt + +[testenv:windows] +commands = + {toxinidir}/bin/runtests.bat From 0d9f7843ba49ef0ab25208e83f5846a9a3ca936f Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 9 Jul 2013 00:41:13 +0600 Subject: [PATCH 6/6] allow passing arguments to runtests script via tox --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index ddfc69371..9f0e77753 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ envlist = py26, py27, lucid, precise deps = -r{toxinidir}/.travis/requirements-latest.txt commands = - {toxinidir}/bin/runtests.sh + {toxinidir}/bin/runtests.sh [] [testenv:lucid] basepython = python2.6 @@ -24,4 +24,4 @@ deps = [testenv:windows] commands = - {toxinidir}/bin/runtests.bat + {toxinidir}/bin/runtests.bat []