From 12ebcfd6c4100be970a9e140c52221305f38eae3 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Fri, 18 Sep 2009 15:31:54 -0300 Subject: [PATCH 1/3] bumped version to 0.8 --- scrapy/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scrapy/__init__.py b/scrapy/__init__.py index f9f348332..c4472cf8a 100644 --- a/scrapy/__init__.py +++ b/scrapy/__init__.py @@ -3,8 +3,8 @@ Scrapy - a screen scraping framework written in Python """ # IMPORTANT: remember to also update the version in docs/conf.py -version_info = (0, 7, 0, 'candidate', 0) -__version__ = "0.7.0-rc1" +version_info = (0, 8, 0, '', 0) +__version__ = "0.8.0-dev" import sys, os From 201ce525e51372e5beb6b0c724d1ab76f33c6cb1 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Mon, 21 Sep 2009 13:07:52 -0300 Subject: [PATCH 2/3] make_release.sh: disabled bdist_wininst command as it doesn't package data files properly on Linux - refs #109 --- extras/make_release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/make_release.sh b/extras/make_release.sh index 08730006c..0f8f3dbc3 100755 --- a/extras/make_release.sh +++ b/extras/make_release.sh @@ -6,8 +6,8 @@ hg purge --all # build packages -version=$(python -c "import scrapy; print scrapy.__version__") -python setup.py sdist +#version=$(python -c "import scrapy; print scrapy.__version__") +#python setup.py sdist # FIXME: bdist_wininst doesn't work on Unix (it doesn't include the data_files) #python setup.py bdist_wininst -t "Scrapy $version" -p "win32" From e0ccb2cceb97adda9ffd7da971e2fb18fb5a300f Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Mon, 28 Sep 2009 12:44:05 -0300 Subject: [PATCH 3/3] ignore request if spider is not opened in downloader when called from engine.download --- scrapy/core/engine.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scrapy/core/engine.py b/scrapy/core/engine.py index 004a65b98..6f1352d6a 100644 --- a/scrapy/core/engine.py +++ b/scrapy/core/engine.py @@ -228,6 +228,9 @@ class ExecutionEngine(object): self.next_request(spider) return _ + if spider not in self.downloader.sites: + return defer.fail(Failure(IgnoreRequest())).addBoth(_on_complete) + dwld = mustbe_deferred(self.downloader.fetch, request, spider) dwld.addCallbacks(_on_success, _on_error) dwld.addBoth(_on_complete)