some deployment changes in preparation for the 0.7.0 release candidate

MANIFEST.in

@@ -3,8 +3,11 @@ include AUTHORS
 include INSTALL
 include LICENSE
 include MANIFEST.in
+include scrapy/core/downloader/responsetypes/mime.types
+recursive-include scrapy/templates *
+recursive-include scrapy/tests/sample_data *
 recursive-include docs *
+prune docs/build
 recursive-include scripts *
-recursive-include examples *
 recursive-include extras *
 recursive-include bin *

docs/conf.py

@@ -49,7 +49,12 @@ copyright = u'2008-2009, Insophia'
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.0'
+try:
+    import scrapy
+    version = scrapy.__version__
+except ImportError:
+    version = ''
+
 # The full version, including alpha/beta/rc tags.
 release = version
 

docs/topics/scrapy-ctl.rst

@@ -63,7 +63,7 @@ The first line will print the currently active project (if any).
 
 Example (active project)::
 
-    Scrapy 0.7.0 - project: myproject
+    Scrapy X.X.X - project: myproject
 
     Usage
     =====
@@ -72,7 +72,7 @@ Example (active project)::
 
 Example (no active project)::
 
-    Scrapy 0.7.0 - no active project
+    Scrapy X.X.X - no active project
 
     Usage
     =====

scrapy/__init__.py

@@ -3,7 +3,8 @@ Scrapy - a screen scraping framework written in Python
 """
 
 # IMPORTANT: remember to also update the version in docs/conf.py
-__version__ = "0.7.0"
+version_info = (0, 7, 0, 'candidate', 0)
+__version__ = "0.7.0-rc1"
 
 import sys, os
 

scrapy/tests/test_cmdline/__init__.py

@@ -3,10 +3,13 @@ import os
 from subprocess import Popen, PIPE
 import unittest
 
+import scrapy
+
 class CmdlineTest(unittest.TestCase):
 
     def setUp(self):
         self.env = os.environ.copy()
+        self.env['PYTHONPATH'] = os.path.dirname(scrapy.__path__[0])
         self.env.pop('SCRAPY_SETTINGS_DISABLED', None)
         self.env['SCRAPY_SETTINGS_MODULE'] = 'scrapy.tests.test_cmdline.settings'
 

scrapy/tests/test_commands.py

@@ -1,11 +1,13 @@
 import sys
 import os
 import subprocess
-from os.path import exists, join
+from os.path import exists, join, dirname
 from shutil import rmtree
 from tempfile import mkdtemp
 import unittest
 
+import scrapy
+
 
 class ProjectTest(unittest.TestCase):
     project_name = 'testproject'
@@ -16,6 +18,7 @@ class ProjectTest(unittest.TestCase):
         self.proj_path = join(self.temp_path, self.project_name)
         self.proj_mod_path = join(self.proj_path, self.project_name)
         self.env = os.environ.copy()
+        self.env['PYTHONPATH'] = dirname(scrapy.__path__[0])
 
     def tearDown(self):
         rmtree(self.temp_path)

setup.py

@@ -81,14 +81,14 @@ if u'SVN' in version:
     version = ' '.join(version.split(' ')[:-1])
 
 setup(
-    name = 'Scrapy',
+    name = 'scrapy',
     version = version,
     url = 'http://scrapy.org',
-    download_url = "http://scrapy.org/releases/scrapy-0.7.0.tar.gz",
     description = 'A high-level Python Screen Scraping framework',
     long_description = 'Scrapy is a high level scraping and web crawling framework for writing spiders to crawl and parse web pages for all kinds of purposes, from information retrieval to monitoring or testing web sites.',
     author = 'Scrapy developers',
-    author_email = '',
+    maintainer = 'Pablo Hoffman',
+    maintainer_email = 'pablo@pablohoffman.com',
     license = 'BSD',
     packages = packages,
     cmdclass = cmdclasses,