From 290f7960611835d5fbf06ea3aa0b065c1f2aedfd Mon Sep 17 00:00:00 2001
From: Julian Taylor <jtaylor.debian@googlemail.com>
Date: Thu, 21 Jul 2011 22:27:47 +0200
Subject: [PATCH 1/5] setup.py: add iplogger manpage to list of manpages

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index 7a4034ca3..ebed9f533 100755
--- a/setup.py
+++ b/setup.py
@@ -130,6 +130,10 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
                   ['docs/man/ipengine.1'],
                   'cd docs/man && gzip -9c ipengine.1 > ipengine.1.gz'),
 
+                 ('docs/man/iplogger.1.gz',
+                  ['docs/man/iplogger.1'],
+                  'cd docs/man && gzip -9c iplogger.1 > iplogger.1.gz'),
+
                  ('docs/man/ipython.1.gz',
                   ['docs/man/ipython.1'],
                   'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),

From 7f4092a01221b8be50b38ddcf744108b1ac0593b Mon Sep 17 00:00:00 2001
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: Thu, 21 Jul 2011 17:21:31 -0500
Subject: [PATCH 2/5] Fix installation of manpages.

---
 setup.py     | 2 +-
 setupbase.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ebed9f533..7e05887f6 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ Under Windows, the command sdist is not supported, since IPython
 requires utilities which are not available under Windows."""
 
 #-----------------------------------------------------------------------------
-#  Copyright (c) 2008-2010, IPython Development Team.
+#  Copyright (c) 2008-2011, IPython Development Team.
 #  Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu>
 #  Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
 #  Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
diff --git a/setupbase.py b/setupbase.py
index e54df3864..25cb8370b 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -206,6 +206,9 @@ def find_data_files():
     
     # Simple file lists can be made by hand
     manpages  = filter(isfile, glob(pjoin('docs','man','*.1.gz')))
+    if not manpages:
+        # When running from a source tree, the manpages aren't gzipped
+        manpages = filter(isfile, glob(pjoin('docs','man','*.1')))
     igridhelpfiles = filter(isfile,
                             glob(pjoin('IPython','extensions','igrid_help.*')))
 

From 526dc1da56538677232f5a33ef0bc8179988c403 Mon Sep 17 00:00:00 2001
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: Fri, 29 Jul 2011 23:40:53 -0500
Subject: [PATCH 3/5] Update docs logo to our current one, other minor fixes.

---
 docs/source/_static/logo.png | Bin 4355 -> 9216 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/source/_static/logo.png b/docs/source/_static/logo.png
index 10fbc0dbe5dbc0ad33bd104257d6f725d96ecce3..e9bdce3941580ff04aaf32d2eb2fb1fe93685bde 100644
GIT binary patch
literal 9216
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
Z-U#uLODtx82kzDZsVi&2>J=^D{SQTAh>ZXM

literal 4355
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
Ln4?SeT%!IDs5!E)


From d4123881c6cf1763752960f1d0db888dae4d2a6e Mon Sep 17 00:00:00 2001
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: Sat, 30 Jul 2011 23:51:40 -0500
Subject: [PATCH 4/5] Disable PDF manual building for distribution and
 installation.

The PDF docs are huge, take forever to build and aren't particularly
useful in practice being so unwieldy.  We can always build and
manually upload a static copy if there's demand, but they don't really
serve much useful purpose anymore and bloat our downloads.
---
 setup.py     | 13 +++++++------
 setupbase.py |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 7e05887f6..5b128a6df 100755
--- a/setup.py
+++ b/setup.py
@@ -170,10 +170,9 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
         for dirpath,dirnames,filenames in os.walk('docs/example'):
             docdeps += [ pjoin(dirpath,f) for f in filenames
                          if not f.endswith('~') ]
-        # then, make them all dependencies for the main PDF (the html will get
-        # auto-generated as well).
+        # then, make them all dependencies for the main html docs
         to_update.append(
-            ('docs/dist/ipython.pdf',
+            ('docs/dist/index.html',
              docdeps,
              "cd docs && make dist")
             )
@@ -218,8 +217,8 @@ if 'setuptools' in sys.modules:
     setup_args['extras_require'] = dict(
         parallel = 'pyzmq>=2.1.4',
         zmq = 'pyzmq>=2.1.4',
-        doc='Sphinx>=0.3',
-        test='nose>=0.10.1',
+        doc = 'Sphinx>=0.3',
+        test = 'nose>=0.10.1',
     )
     requires = setup_args.setdefault('install_requires', [])
     setupext.display_status = False
@@ -244,7 +243,9 @@ if 'setuptools' in sys.modules:
             print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
             sys.exit(1)
         setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]
-        setup_args['options'] = {"bdist_wininst": {"install_script": "ipython_win_post_install.py"}}
+        setup_args['options'] = {"bdist_wininst":
+                                 {"install_script":
+                                  "ipython_win_post_install.py"}}
 else:
     # If we are running without setuptools, call this function which will
     # check for dependencies an inform the user what is needed.  This is
diff --git a/setupbase.py b/setupbase.py
index 25cb8370b..d517dce79 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -220,7 +220,7 @@ def find_data_files():
     )
     manual_files = make_dir_struct(
         'data',
-        pjoin('docs','dist'),
+        pjoin('docs','html'),
         pjoin(docdirbase,'manual')
     )
 

From 90b3e22759071f7afaa1f2de011dc0fca4f74fe6 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Sat, 30 Jul 2011 14:16:38 -0700
Subject: [PATCH 5/5] Generate package list automatically in find_packages

Previously, the package list was manually specified, which meant that
it became out of date any time a package was added, and IPython would
become uninstallable. This would not be noticed for some time by
developers, who always use `setupegg.py --develop` or symlinks.

This update immediately revealed that IPython.zmq.tests and IPython.extensions.tests were never included in 0.11.  Other than that, there is no difference in the package list.
---
 setupbase.py | 59 ++++++++++------------------------------------------
 1 file changed, 11 insertions(+), 48 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index d517dce79..305e9c92b 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -82,58 +82,21 @@ setup_args = dict(
 # Find packages
 #---------------------------------------------------------------------------
 
-def add_package(packages,pname,config=False,tests=False,scripts=False,
-                others=None):
-    """
-    Add a package to the list of packages, including certain subpackages.
-    """
-    packages.append('.'.join(['IPython',pname]))
-    if config:
-        packages.append('.'.join(['IPython',pname,'config']))
-    if tests:
-        packages.append('.'.join(['IPython',pname,'tests']))
-    if scripts:
-        packages.append('.'.join(['IPython',pname,'scripts']))
-    if others is not None:
-        for o in others:
-            packages.append('.'.join(['IPython',pname,o]))
-
 def find_packages():
     """
     Find all of IPython's packages.
     """
-    packages = ['IPython']
-    add_package(packages, 'config', tests=True, others=['profile'])
-    add_package(packages, 'core', tests=True)
-    add_package(packages, 'extensions')
-    add_package(packages, 'external')
-    add_package(packages, 'external.argparse')
-    add_package(packages, 'external.decorator')
-    add_package(packages, 'external.decorators')
-    add_package(packages, 'external.guid')
-    add_package(packages, 'external.Itpl')
-    add_package(packages, 'external.mglob')
-    add_package(packages, 'external.path')
-    add_package(packages, 'external.pexpect')
-    add_package(packages, 'external.pyparsing')
-    add_package(packages, 'external.simplegeneric')
-    add_package(packages, 'external.ssh')
-    add_package(packages, 'kernel')
-    add_package(packages, 'frontend')
-    add_package(packages, 'frontend.qt')
-    add_package(packages, 'frontend.qt.console', tests=True)
-    add_package(packages, 'frontend.terminal', tests=True)    
-    add_package(packages, 'lib', tests=True)
-    add_package(packages, 'parallel', tests=True, scripts=True, 
-                                    others=['apps','engine','client','controller'])
-    add_package(packages, 'quarantine', tests=True)
-    add_package(packages, 'scripts')
-    add_package(packages, 'testing', tests=True)
-    add_package(packages, 'testing.plugin', tests=False)
-    add_package(packages, 'utils', tests=True)
-    add_package(packages, 'zmq')
-    add_package(packages, 'zmq.pylab')
-    add_package(packages, 'zmq.gui')
+    excludes = ['deathrow']
+    packages = []
+    for dir,subdirs,files in os.walk('IPython'):
+        package = dir.replace(os.path.sep, '.')
+        if any([ package.startswith('IPython.'+exc) for exc in excludes ]):
+            # package is to be excluded (e.g. deathrow)
+            continue
+        if '__init__.py' not in files:
+            # not a package
+            continue
+        packages.append(package)
     return packages
 
 #---------------------------------------------------------------------------