p2yq6ufca
/
monkeyking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish doc/build tools cleanup.

Browse Source 
Fix small stderr flush error in exception reporting.
Final fixes to cpaste to support doctests.
Fernando Perez 18 years ago
parent f67d122147
commit 427d1da3f5
1 changed files with 66 additions and 45 deletions
Show Stats Download Patch File Download Diff File

111
setup.py
Unescape View File

@ -4,7 +4,7 @@
Under Posix environments it works like a typical setup.py script.
Under Windows, the command sdist is not supported, since IPython
requires utilities, which are not available under Windows."""
requires utilities which are not available under Windows."""
#*****************************************************************************
# Copyright (C) 2001-2005 Fernando Perez <fperez@colorado.edu>
@ -18,15 +18,41 @@ import os
import sys
from glob import glob
# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
# update it when the contents of directories change.
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
from distutils.core import setup
from setupext import install_data_ext
# Local imports
from IPython.genutils import target_update
# A few handy globals
isfile = os.path.isfile
pjoin = os.path.join
# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
# update it when the contents of directories change.
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
##############################################################################
# Utility functions
def oscmd(s):
print ">", s
os.system(s)
# A little utility we'll need below, since glob() does NOT allow you to do
# exclusion on multiple endings!
def file_doesnt_endwith(test,endings):
"""Return true if test is a file and its name does NOT end with any
of the strings listed in endings."""
if not isfile(test):
return False
for e in endings:
if test.endswith(e):
return False
return True
###############################################################################
# Main code begins
if os.name == 'posix':
os_name = 'posix'
@ -36,45 +62,45 @@ else:
print 'Unsupported operating system:',os.name
sys.exit(1)
# Under Windows, 'sdist' is not supported, since it requires lyxport (and
# hence lyx,perl,latex,pdflatex,latex2html,sh,...)
# Under Windows, 'sdist' has not been supported. Now that the docs build with
# Sphinx it might work, but let's not turn it on until someone confirms that it
# actually works.
if os_name == 'windows' and 'sdist' in sys.argv:
print 'The sdist command is not available under Windows. Exiting.'
sys.exit(1)
from distutils.core import setup
# update the manuals when building a source dist
if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
import textwrap
from IPython.genutils import target_update
# list of things to be updated. Each entry is a triplet of args for
# List of things to be updated. Each entry is a triplet of args for
# target_update()
def oscmd(s):
print ">", s
os.system(s)
oscmd("cd doc && python do_sphinx.py")
oscmd("cd doc && gzip -9c ipython.1 > ipython.1.gz")
oscmd("cd doc && gzip -9c pycolor.1 > pycolor.1.gz")
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" ),
# FIXME - Disabled for now: we need to redo an automatic way
# of generating the magic info inside the rst.
#('doc/magic.tex',
#['IPython/Magic.py'],
#"cd doc && ./update_magic.sh" ),
('doc/ipython.1.gz',
['doc/ipython.1'],
"cd doc && gzip -9c ipython.1 > ipython.1.gz"),
('doc/pycolor.1.gz',
['doc/pycolor.1'],
"cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
]
[ target_update(*t) for t in to_update ]
# Release.py contains version, authors, license, url, keywords, etc.
execfile(pjoin('IPython','Release.py'))
# A little utility we'll need below, since glob() does NOT allow you to do
# exclusion on multiple endings!
def file_doesnt_endwith(test,endings):
"""Return true if test is a file and its name does NOT end with any
of the strings listed in endings."""
if not isfile(test):
return False
for e in endings:
if test.endswith(e):
return False
return True
# I can't find how to make distutils create a nested dir. structure, so
# in the meantime do it manually. Butt ugly.
# Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
@ -87,18 +113,15 @@ manpagebase = 'share/man/man1'
# MANIFEST.in file.
exclude = ('.sh','.1.gz')
docfiles = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*'))
examfiles = filter(isfile, glob('doc/examples/*.py'))
manfiles = filter(isfile, glob('doc/build/html/*'))
manstatic = filter(isfile, glob('doc/build/html/_static/*'))
# filter(isfile, glob('doc/manual/*.css')) + \
# filter(isfile, glob('doc/manual/*.png'))
manfiles = filter(isfile, glob('doc/manual/*'))
manstatic = filter(isfile, glob('doc/manual/_static/*'))
manpages = filter(isfile, glob('doc/*.1.gz'))
cfgfiles = filter(isfile, glob('IPython/UserConfig/*'))
scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor',
'scripts/irunner'])
igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
# Script to be run by the windows binary installer after the default setup
@ -129,19 +152,15 @@ if 'setuptools' in sys.modules:
]}
}
scriptfiles = []
# eggs will lack docs, eaxmples
# eggs will lack docs, examples
datafiles = []
#datafiles = [('lib', 'IPython/UserConfig', cfgfiles)]
else:
# Normal, non-setuptools install
egg_extra_kwds = {}
# package_data of setuptools was introduced to distutils in 2.4
if sys.version_info < (2,4):
datafiles.append(('lib', 'IPython/UserConfig', cfgfiles))
# Call the setup() routine which does most of the work
setup(name = name,
version = version,
@ -154,7 +173,9 @@ setup(name = name,
license = license,
platforms = platforms,
keywords = keywords,
packages = ['IPython', 'IPython.Extensions', 'IPython.external', 'IPython.gui', 'IPython.gui.wx', 'IPython.UserConfig'],
packages = ['IPython', 'IPython.Extensions', 'IPython.external',
'IPython.gui', 'IPython.gui.wx',
'IPython.UserConfig'],
scripts = scriptfiles,
package_data = {'IPython.UserConfig' : ['*'] },

Write Preview
Loading…
Cancel
Save