##// END OF EJS Templates
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.

File last commit:

r2048:d5d637e4
r2124:4a54d9d3 merge
Show More
Makefile
74 lines | 1.4 KiB | text/x-makefile | MakefileLexer
# Set this prefix to where you want to install the plugin
PREFIX=/usr/local
NOSE0=nosetests -vs --with-doctest --doctest-tests --detailed-errors
NOSE=nosetests -vvs --with-ipdoctest --doctest-tests --doctest-extension=txt \
--detailed-errors
SRC=ipdoctest.py setup.py ../decorators.py
# Default target for clean 'make'
default: iplib
# The actual plugin installation
plugin: IPython_doctest_plugin.egg-info
# Simple targets that test one thing
simple: plugin simple.py
$(NOSE) simple.py
dtest: plugin dtexample.py
$(NOSE) dtexample.py
rtest: plugin test_refs.py
$(NOSE) test_refs.py
test: plugin dtexample.py
$(NOSE) dtexample.py test*.py test*.txt
deb: plugin dtexample.py
$(NOSE) test_combo.txt
# IPython tests
deco:
$(NOSE0) IPython.testing.decorators
magic: plugin
$(NOSE) IPython.core.magic
excolors: plugin
$(NOSE) IPython.core.excolors
iplib: plugin
$(NOSE) IPython.core.iplib
strd: plugin
$(NOSE) IPython.core.strdispatch
engine: plugin
$(NOSE) IPython.kernel
tf: plugin
$(NOSE) IPython.config.traitlets
# All of ipython itself
ipython: plugin
$(NOSE) IPython
# Combined targets
sr: rtest strd
base: dtest rtest test strd deco
quick: base iplib ipipe
all: base ipython
# Main plugin and cleanup
IPython_doctest_plugin.egg-info: $(SRC)
python setup.py install --prefix=$(PREFIX)
touch $@
clean:
rm -rf IPython_doctest_plugin.egg-info *~ *pyc build/ dist/