Finished initial reworking and updating of setup.py and friends, including the MANIFEST.in. Everything seems

to work fine. 

I have also gone through the tests in various subpackages (like kernel) and have protected imports of 
twisted, zope.interface and foolscap with a try/except clause.  Now the tests are simply not run
if these deps are missing.  All tests now pass no matter what.

IPython/kernel/__init__.py

@@ -21,3 +21,4 b' __docformat__ = "restructuredtext en"'
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
+    
  No newline at end of file

IPython/kernel/tests/test_controllerservice.py

@@ -23,12 +23,15 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 from twisted.application.service import IService
 from IPython.kernel.controllerservice import ControllerService
 from IPython.kernel.tests import multienginetest as met
 from controllertest import IControllerCoreTestCase
 from IPython.testing.util import DeferredTestCase
-
+except ImportError:
+    pass
+else:
 class BasicControllerServiceTest(DeferredTestCase,
     IControllerCoreTestCase):
     

IPython/kernel/tests/test_enginefc.py

@@ -15,7 +15,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-
+try:
 from twisted.python import components
 from twisted.internet import reactor, defer
 from twisted.spread import pb
@@ -36,7 +36,10 b' from IPython.kernel.tests.engineservicetest import \\'
     IEngineCoreTestCase, \
     IEngineSerializedTestCase, \
     IEngineQueuedTestCase
-
+except ImportError:
+    print "we got an error!!!"
+    pass
+else:
 class EngineFCTest(DeferredTestCase, 
                    IEngineCoreTestCase, 
                    IEngineSerializedTestCase,

IPython/kernel/tests/test_engineservice.py

@@ -23,6 +23,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 from twisted.internet import defer
 from twisted.application.service import IService
 
@@ -33,8 +34,9 b' from IPython.kernel.tests.engineservicetest import \\'
     IEngineSerializedTestCase, \
     IEngineQueuedTestCase, \
     IEnginePropertiesTestCase
-    
-
+except ImportError:
+    pass
+else:
 class BasicEngineServiceTest(DeferredTestCase,
                              IEngineCoreTestCase, 
                              IEngineSerializedTestCase,

IPython/kernel/tests/test_multiengine.py

@@ -15,14 +15,16 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 from twisted.internet import defer
 from IPython.testing.util import DeferredTestCase
 from IPython.kernel.controllerservice import ControllerService
 from IPython.kernel import multiengine as me
 from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
     ISynchronousMultiEngineTestCase)
-    
-    
+except ImportError:
+    pass
+else:    
 class BasicMultiEngineTestCase(DeferredTestCase, IMultiEngineTestCase):
     
     def setUp(self):

IPython/kernel/tests/test_multienginefc.py

@@ -14,6 +14,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 from twisted.internet import defer, reactor
 
 from IPython.kernel.fcutil import Tub, UnauthenticatedTub
@@ -25,8 +26,9 b' from IPython.kernel.tests.multienginetest import IFullSynchronousMultiEngineTest'
 from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
 from IPython.kernel import multiengine as me
 from IPython.kernel.clientconnector import ClientConnector
-
-
+except ImportError:
+    pass
+else:
 class FullSynchronousMultiEngineTestCase(DeferredTestCase, IFullSynchronousMultiEngineTestCase):
     
     def setUp(self):

IPython/kernel/tests/test_newserialized.py

@@ -15,6 +15,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 import zope.interface as zi
 from twisted.trial import unittest
 from IPython.testing.util import DeferredTestCase
@@ -26,7 +27,9 b' from IPython.kernel.newserialized import \\'
     UnSerialized, \
     SerializeIt, \
     UnSerializeIt
-    
+except ImportError:
+    pass
+else:
 #-------------------------------------------------------------------------------
 # Tests
 #-------------------------------------------------------------------------------

IPython/kernel/tests/test_pendingdeferred.py

@@ -16,6 +16,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 from twisted.internet import defer
 from twisted.python import failure
 
@@ -25,7 +26,9 b' from IPython.testing.util import DeferredTestCase'
 import IPython.kernel.pendingdeferred as pd
 from IPython.kernel import error
 from IPython.kernel.util import printer
-
+except ImportError:
+    pass
+else:
 
 #-------------------------------------------------------------------------------
 # Setup for inline and standalone doctests

IPython/kernel/tests/test_task.py

@@ -15,6 +15,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 import time
 
 from twisted.internet import defer
@@ -24,7 +25,9 b' from IPython.kernel import task, controllerservice as cs, engineservice as es'
 from IPython.kernel.multiengine import IMultiEngine
 from IPython.testing.util import DeferredTestCase
 from IPython.kernel.tests.tasktest import ITaskControllerTestCase
-
+except ImportError:
+    pass
+else:
 #-------------------------------------------------------------------------------
 # Tests
 #-------------------------------------------------------------------------------

IPython/kernel/tests/test_taskfc.py

@@ -14,6 +14,7 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
+try:
 import time
 
 from twisted.internet import defer, reactor
@@ -29,6 +30,9 b' from IPython.kernel.taskfc import IFCTaskController'
 from IPython.kernel.util import printer
 from IPython.kernel.tests.tasktest import ITaskControllerTestCase
 from IPython.kernel.clientconnector import ClientConnector
+except ImportError:
+    pass
+else:
 
 #-------------------------------------------------------------------------------
 # Tests

MANIFEST.in

@@ -8,6 +8,11 b' graft setupext'
 
 graft IPython/UserConfig
 
+graft IPython/kernel
+graft IPython/config
+graft IPython/testing
+graft IPython/tools
+
 graft doc
 exclude doc/\#*
 exclude doc/*.1

setup.py

@@ -72,12 +72,7 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
 
     # List of things to be updated. Each entry is a triplet of args for
     # target_update()
-    to_update = [ # The do_sphinx scripts builds html and pdf, so just one
-                  # target is enough to cover all manual generation
-                 ('doc/manual/ipython.pdf',
-                  ['IPython/Release.py','doc/source/ipython.rst'],
-                  "cd doc && python do_sphinx.py" ),
-
+    to_update = [
                   # FIXME - Disabled for now: we need to redo an automatic way
                   # of generating the magic info inside the rst.                
                   #('doc/magic.tex',
@@ -93,6 +88,18 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
                   "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
                  ]
 
+    try:
+        import sphinx
+    except ImportError:
+        pass
+    else:
+        # The do_sphinx scripts builds html and pdf, so just one
+        # target is enough to cover all manual generation
+        to_update.append(
+            ('doc/manual/ipython.pdf',
+            ['IPython/Release.py','doc/source/ipython.rst'],
+            "cd doc && python do_sphinx.py")
+        )
     [ target_update(*t) for t in to_update ]
 
 #---------------------------------------------------------------------------
@@ -152,9 +159,6 b' else:'
 # Do the actual setup now
 #---------------------------------------------------------------------------
 
-print packages
-
-
 setup_args['packages'] = packages
 setup_args['package_data'] = package_data
 setup_args['scripts'] = scripts

setupegg.py

@@ -11,7 +11,7 b" sys.path.insert(0,'%s/usr/local/lib/python%s/site-packages' %"
 
 # now, import setuptools and call the actual setup
 import setuptools
-print sys.argv
+# print sys.argv
 #sys.argv=['','bdist_egg']
 execfile('setup.py')