diff --git a/docs/source/_static/logo.png b/docs/source/_static/logo.png index 10fbc0dbe..e9bdce394 100644 Binary files a/docs/source/_static/logo.png and b/docs/source/_static/logo.png differ diff --git a/setup.py b/setup.py index 7a4034ca3..5b128a6df 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 # Copyright (c) 2001, Janko Hauser # Copyright (c) 2001, Nathaniel Gray @@ -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'), @@ -166,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") ) @@ -214,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 @@ -240,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 0955e2351..be3860766 100644 --- a/setupbase.py +++ b/setupbase.py @@ -82,63 +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.html') - add_package(packages, 'frontend.html.notebook') - 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, 'nbformat', tests=True) - add_package(packages, 'nbformat.v1', tests=True) - add_package(packages, 'nbformat.v2', 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 #--------------------------------------------------------------------------- @@ -223,6 +181,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.*'))) @@ -234,7 +195,7 @@ def find_data_files(): ) manual_files = make_dir_struct( 'data', - pjoin('docs','dist'), + pjoin('docs','html'), pjoin(docdirbase,'manual') )