##// END OF EJS Templates
promote aliases and flags, to ensure they have priority over config files...
promote aliases and flags, to ensure they have priority over config files add Application.flatten_flags() method, which adjusts the alias and flag dicts, such that they point to the subclass in the Application.classes list when passed to the argv parser. This prevents TerminalInteractiveShell.colors in a config file overriding `--colors` on the command-line, which points to InteractiveShell.colors. Flattening is only done when the answer is unambiguous, so multiply inherited classes (e.g. Launchers in ipcluster) are not touched. also remove now-obsolete manual workaround for this in IPClusterStart closes gh-849

File last commit:

r2760:afe1263a
r4977:d2ab6923
Show More
Makefile
74 lines | 1.4 KiB | text/x-makefile | MakefileLexer
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334 # Set this prefix to where you want to install the plugin
gvaroquaux
Fix buglet in frontend completion.
r1628 PREFIX=/usr/local
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334
Gael Varoquaux
Fix tests when ipdoctest nose plugin is enable (Grrr, no isolation at...
r1505 NOSE0=nosetests -vs --with-doctest --doctest-tests --detailed-errors
Fernando Perez
Correctly implement namespace handling. Minor cleanups....
r1509 NOSE=nosetests -vvs --with-ipdoctest --doctest-tests --doctest-extension=txt \
--detailed-errors
Fernando Perez
Checkpoint with more tests working....
r1420
Fernando Perez
Complete first pass on testing system. All tests pass on my box. Whew....
r1435 SRC=ipdoctest.py setup.py ../decorators.py
Fernando Perez
Checkpoint with more tests working....
r1420
Fernando Perez
Checkpoint before merging with upstream
r1482 # Default target for clean 'make'
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 default: interactiveshell
Fernando Perez
Checkpoint before merging with upstream
r1482
# The actual plugin installation
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334 plugin: IPython_doctest_plugin.egg-info
Fernando Perez
Checkpoint before merging with upstream
r1482 # Simple targets that test one thing
simple: plugin simple.py
$(NOSE) simple.py
Fernando Perez
Checkpoint where tests are recognized. Random tests not working yet.
r1378 dtest: plugin dtexample.py
Fernando Perez
Checkpoint with more tests working....
r1420 $(NOSE) dtexample.py
Fernando Perez
Checkpoint where tests are recognized. Random tests not working yet.
r1378
Fernando Perez
Checkpoint before merging with upstream
r1482 rtest: plugin test_refs.py
Fernando Perez
Checkpoint with more tests working....
r1420 $(NOSE) test_refs.py
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334 test: plugin dtexample.py
Fernando Perez
Checkpoint with more tests working....
r1420 $(NOSE) dtexample.py test*.py test*.txt
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334
deb: plugin dtexample.py
Fernando Perez
Checkpoint with more tests working....
r1420 $(NOSE) test_combo.txt
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334
Fernando Perez
Checkpoint before merging with upstream
r1482 # IPython tests
Fernando Perez
Checkpoint with more tests working....
r1420 deco:
Fernando Perez
Correctly implement namespace handling. Minor cleanups....
r1509 $(NOSE0) IPython.testing.decorators
Fernando Perez
Complete first pass on testing system. All tests pass on my box. Whew....
r1435
Fernando Perez
Checkpoint before merging with upstream
r1482 magic: plugin
Brian Granger
Magic.py => core/magic.py and imports updated.
r2036 $(NOSE) IPython.core.magic
Fernando Perez
Complete first pass on testing system. All tests pass on my box. Whew....
r1435
Fernando Perez
Fixes to testing system: ipdocetst plugin wasn't being properly loaded.
r1761 excolors: plugin
Brian Granger
excolors.py => core/excolors.py and updated import statements.
r2021 $(NOSE) IPython.core.excolors
Fernando Perez
Checkpoint with more tests working....
r1420
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 interactiveshell: plugin
$(NOSE) IPython.core.interactiveshell
Fernando Perez
Checkpoint before merging with upstream
r1482
strd: plugin
Brian Granger
ultraTB.py => core/ultratb.py and imports updated.
r2048 $(NOSE) IPython.core.strdispatch
Fernando Perez
Checkpoint before merging with upstream
r1482
Fernando Perez
Correctly implement namespace handling. Minor cleanups....
r1509 engine: plugin
$(NOSE) IPython.kernel
tf: plugin
$(NOSE) IPython.config.traitlets
Fernando Perez
Checkpoint before merging with upstream
r1482 # All of ipython itself
ipython: plugin
$(NOSE) IPython
Fernando Perez
Correctly implement namespace handling. Minor cleanups....
r1509
Fernando Perez
Checkpoint before merging with upstream
r1482 # Combined targets
sr: rtest strd
Fernando Perez
Checkpoint with more tests working....
r1420
Fernando Perez
Checkpoint before merging with upstream
r1482 base: dtest rtest test strd deco
Fernando Perez
Checkpoint with more tests working....
r1420
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 quick: base interactiveshell ipipe
Fernando Perez
Correctly implement namespace handling. Minor cleanups....
r1509
Fernando Perez
Checkpoint before merging with upstream
r1482 all: base ipython
Fernando Perez
Fixes to testing....
r1376
Fernando Perez
Checkpoint before merging with upstream
r1482 # Main plugin and cleanup
Fernando Perez
Checkpoint with more tests working....
r1420 IPython_doctest_plugin.egg-info: $(SRC)
Fernando Perez
Added Nose support for IPython doctests and extension modules.
r1334 python setup.py install --prefix=$(PREFIX)
touch $@
clean:
rm -rf IPython_doctest_plugin.egg-info *~ *pyc build/ dist/