##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Merging -r 1177 from lp:ipython with fixes and resolutions....
Merging -r 1177 from lp:ipython with fixes and resolutions. The main conflicts I had to fix were in ultratb. I have removed the ultraTB.py in IPython/kernel/core. Now IPython/core/ultratb.py is being used everywhere. Also I have protected the calls to ipapi.get to see if None is returned. This happens when trial IPython.kernel is run.
Brian Granger - - Load All Authors

File last commit:

r2064:a2e46ebb
r2124:4a54d9d3 merge
Show More
MANIFEST.in
37 lines | 666 B | text/plain | TextLexer
/ MANIFEST.in
History | Annotation | Raw |Copy content |Copy permalink
include ipython.py
include setupbase.py
include setupegg.py
graft setupext
graft scripts
graft IPython/kernel
graft IPython/config
graft IPython/core
graft IPython/deathrow
graft IPython/external
graft IPython/frontend
graft IPython/gui
graft IPython/lib
graft IPython/quarantine
graft IPython/scripts
graft IPython/testing
graft IPython/utils
recursive-include IPython/extensions igrid_help*
graft docs
exclude docs/\#*
exclude docs/man/*.1
# docs subdirs we want to skip
prune docs/attic
prune docs/build
global-exclude *~
global-exclude *.flc
global-exclude *.pyc
global-exclude .dircopy.log
global-exclude .svn
global-exclude .bzr
global-exclude .hgignore