##// END OF EJS Templates
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py

File last commit:

r8734:6aa251de
r8798:c1e52e56 merge
Show More
MANIFEST.in
37 lines | 796 B | text/plain | TextLexer
include README.rst
include COPYING.txt
include ipython.py
include setupbase.py
include setupegg.py
graft setupext
graft scripts
# Load main dir but exclude things we don't want in the distro
graft IPython
prune IPython/deathrow
prune IPython/external/js
prune IPython/frontend/html/notebook/static/mathjax
# Include some specific files and data resources we need
include IPython/.git_commit_info.ini
include IPython/frontend/qt/console/resources/icon/IPythonConsole.svg
# Documentation
graft docs
exclude docs/\#*
exclude docs/man/*.1.gz
# docs subdirs we want to skip
prune docs/attic
prune docs/build
prune docs/gh-pages
prune docs/dist
# Patterns to exclude from any directory
global-exclude *~
global-exclude *.flc
global-exclude *.pyc
global-exclude *.pyo
global-exclude .dircopy.log