intermediate changes

ref:a9d4234963219fc3b778fe9667bd10e632ddd89b

6 files changed, 2 insertions, 76 deletions

diff --git a/contrib/python/ipython/py2/IPython/core/release.py b/contrib/python/ipython/py2/IPython/core/release.py
index 94dea1073b..3aefc2393f 100644
--- a/contrib/python/ipython/py2/IPython/core/release.py
+++ b/contrib/python/ipython/py2/IPython/core/release.py
@@ -20,7 +20,7 @@ name = 'ipython'
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 5
-_version_minor = 9
+_version_minor = 10
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'rc1'
diff --git a/contrib/python/ipython/py2/IPython/terminal/ipapp.py b/contrib/python/ipython/py2/IPython/terminal/ipapp.py
index 6b25aaa3e3..6b25aaa3e3 100755..100644
--- a/contrib/python/ipython/py2/IPython/terminal/ipapp.py
+++ b/contrib/python/ipython/py2/IPython/terminal/ipapp.py
diff --git a/contrib/python/ipython/py2/IPython/testing/plugin/Makefile b/contrib/python/ipython/py2/IPython/testing/plugin/Makefile
deleted file mode 100644
index 6f999a38fd..0000000000
--- a/contrib/python/ipython/py2/IPython/testing/plugin/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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/
diff --git a/contrib/python/ipython/py2/IPython/testing/plugin/iptest.py b/contrib/python/ipython/py2/IPython/testing/plugin/iptest.py
index a75cab993f..a75cab993f 100755..100644
--- a/contrib/python/ipython/py2/IPython/testing/plugin/iptest.py
+++ b/contrib/python/ipython/py2/IPython/testing/plugin/iptest.py
diff --git a/contrib/python/ipython/py2/IPython/testing/plugin/setup.py b/contrib/python/ipython/py2/IPython/testing/plugin/setup.py
index a3281d30c8..a3281d30c8 100755..100644
--- a/contrib/python/ipython/py2/IPython/testing/plugin/setup.py
+++ b/contrib/python/ipython/py2/IPython/testing/plugin/setup.py
diff --git a/contrib/python/ipython/py2/IPython/utils/_sysinfo.py b/contrib/python/ipython/py2/IPython/utils/_sysinfo.py
index 21dd2fcceb..ee382c79f9 100644
--- a/contrib/python/ipython/py2/IPython/utils/_sysinfo.py
+++ b/contrib/python/ipython/py2/IPython/utils/_sysinfo.py
@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = u"2348ebbe4"
+commit = u"818206a23"