##// END OF EJS Templates
Backport PR #8829: Qt5 fix...
Backport PR #8829: Qt5 fix Fix for issue #8757. The problem was that IPython.external.qt was moved to qtconsole.qt, but IPython.external.qt_for_kernel was still trying to import IPython.external.qt. Rather than copying the qt.py file back to external, this PR merges the logic back into qt_for_kernel.py. Deferring to qt.py was a bit silly because both qt.py and qt_for_kernel.py do basically the same thing but in slightly different ways. Moreover, the assumption of qt.py was that if the QT_API environment variable is set, it must be in an ETS environment and need to comply by the ETS import logic. This is not valid, as ipython sets the QT_API environment variable to communicate intent as to Qt version, in `IPython/lib/inputhook.py:385` ...

File last commit:

r2760:afe1263a
r21823:e0eb38c1
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: interactiveshell
# 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
interactiveshell: plugin
$(NOSE) IPython.core.interactiveshell
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 interactiveshell 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/