intermediate changes

ref:a9d4234963219fc3b778fe9667bd10e632ddd89b

11 files changed, 271 insertions, 96 deletions

diff --git a/contrib/python/ipython/py2/.dist-info/METADATA b/contrib/python/ipython/py2/.dist-info/METADATA
index 758e567f25..0a1b71b77e 100644
--- a/contrib/python/ipython/py2/.dist-info/METADATA
+++ b/contrib/python/ipython/py2/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipython
-Version: 5.9.0
+Version: 5.10.0
 Summary: IPython: Productive Interactive Computing
 Home-page: https://ipython.org
 Author: The IPython Development Team
@@ -25,7 +25,7 @@ Requires-Dist: pickleshare
 Requires-Dist: simplegeneric (>0.8)
 Requires-Dist: traitlets (>=4.2)
 Requires-Dist: prompt-toolkit (<2.0.0,>=1.0.4)
-Requires-Dist: pygments
+Requires-Dist: pygments (<2.6)
 Requires-Dist: backports.shutil-get-terminal-size ; python_version == "2.7"
 Requires-Dist: pathlib2 ; python_version == "2.7" or python_version == "3.3"
 Requires-Dist: pexpect ; sys_platform != "win32"
@@ -34,17 +34,17 @@ Requires-Dist: colorama ; sys_platform == "win32"
 Requires-Dist: win-unicode-console (>=0.5) ; sys_platform == "win32" and python_version < "3.6"
 Provides-Extra: all
 Requires-Dist: ipyparallel ; extra == 'all'
-Requires-Dist: requests ; extra == 'all'
-Requires-Dist: nbformat ; extra == 'all'
-Requires-Dist: notebook ; extra == 'all'
-Requires-Dist: qtconsole ; extra == 'all'
+Requires-Dist: nose (>=0.10.1) ; extra == 'all'
 Requires-Dist: ipywidgets ; extra == 'all'
+Requires-Dist: qtconsole ; extra == 'all'
+Requires-Dist: requests ; extra == 'all'
 Requires-Dist: ipykernel ; extra == 'all'
-Requires-Dist: nose (>=0.10.1) ; extra == 'all'
-Requires-Dist: nbconvert ; extra == 'all'
 Requires-Dist: testpath ; extra == 'all'
+Requires-Dist: nbconvert ; extra == 'all'
 Requires-Dist: Sphinx (>=1.3) ; extra == 'all'
-Requires-Dist: pygments ; extra == 'all'
+Requires-Dist: pygments (<2.6) ; extra == 'all'
+Requires-Dist: notebook ; extra == 'all'
+Requires-Dist: nbformat ; extra == 'all'
 Provides-Extra: doc
 Requires-Dist: Sphinx (>=1.3) ; extra == 'doc'
 Provides-Extra: kernel
@@ -65,7 +65,7 @@ Provides-Extra: test
 Requires-Dist: nose (>=0.10.1) ; extra == 'test'
 Requires-Dist: requests ; extra == 'test'
 Requires-Dist: testpath ; extra == 'test'
-Requires-Dist: pygments ; extra == 'test'
+Requires-Dist: pygments (<2.6) ; extra == 'test'
 Requires-Dist: nbformat ; extra == 'test'
 Requires-Dist: ipykernel ; extra == 'test'
 Requires-Dist: mock ; (python_version == "2.7") and extra == 'test'
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"
diff --git a/contrib/python/ipython/py2/README.rst b/contrib/python/ipython/py2/README.rst
new file mode 100644
index 0000000000..f50965a4ae
--- /dev/null
+++ b/contrib/python/ipython/py2/README.rst
@@ -0,0 +1,51 @@
+.. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=master
+    :target: https://codecov.io/github/ipython/ipython?branch=master
+
+.. image:: https://img.shields.io/pypi/dm/IPython.svg           
+    :target: https://pypi.python.org/pypi/ipython
+
+.. image:: https://img.shields.io/pypi/v/IPython.svg            
+    :target: https://pypi.python.org/pypi/ipython
+
+.. image:: https://img.shields.io/travis/ipython/ipython.svg    
+    :target: https://travis-ci.org/ipython/ipython
+
+
+===========================================
+ IPython: Productive Interactive Computing
+===========================================
+
+Overview
+========
+
+Welcome to IPython.  Our full documentation is available on `ipython.readthedocs.io
+<https://ipython.readthedocs.io/en/stable/>`_ and contain information on how to install, use
+contribute to the project.
+
+Officially, IPython requires Python version 2.7, or 3.3 and above.
+IPython 1.x is the last IPython version to support Python 2.6 and 3.2.
+
+The Notebook, Qt console and a number of other pieces are now parts of *Jupyter*.
+See the `Jupyter installation docs <http://jupyter.readthedocs.io/en/latest/install.html>`__
+if you want to use these.
+
+
+
+
+Developement and Instant runnimg
+================================
+
+You can find the latest version of the development documentation on `readthedocs
+<http://ipython.readthedocs.io/en/latest/>`_. 
+
+You can run IPython from this directory without even installing it system-wide
+by typing at the terminal::
+    
+   $ python -m IPython
+
+Or see the `developement installation docs
+<http://ipython.readthedocs.io/en/latest/install/install.html#installing-the-development-version>`_
+for the latest revision on read the docs. 
+
+Documentation and installation instructions for older version of IPython can be
+found on the `IPython website <http://ipython.org/documentation.html>`_
diff --git a/contrib/python/ipython/py2/patches/01-arcadia.patch b/contrib/python/ipython/py2/patches/01-arcadia.patch
new file mode 100644
index 0000000000..3a14077574
--- /dev/null
+++ b/contrib/python/ipython/py2/patches/01-arcadia.patch
@@ -0,0 +1,144 @@
+--- contrib/python/ipython/py2/IPython/core/completerlib.py	(index)
++++ contrib/python/ipython/py2/IPython/core/completerlib.py	(working tree)
+@@ -19,6 +19,7 @@ from __future__ import print_function
+ # Stdlib imports
+ import glob
+ import inspect
++import itertools
+ import os
+ import re
+ import sys
+@@ -44,6 +45,8 @@ from IPython.utils.py3compat import string_types
+ # FIXME: this should be pulled in with the right call via the component system
+ from IPython import get_ipython
+ 
++from __res import importer
++
+ #-----------------------------------------------------------------------------
+ # Globals and constants
+ #-----------------------------------------------------------------------------
+@@ -68,6 +71,51 @@ magic_run_re = re.compile(r'.*(\.ipy|\.ipynb|\.py[w]?)$')
+ # Local utilities
+ #-----------------------------------------------------------------------------
+ 
++arcadia_rootmodules_cache = None
++arcadia_modules_cache = None
++
++
++def arcadia_init_cache():
++    global arcadia_rootmodules_cache, arcadia_modules_cache
++    arcadia_rootmodules_cache = set()
++    arcadia_modules_cache = {}
++
++    all_modules = itertools.chain(
++        sys.builtin_module_names,
++        importer.memory
++    )
++
++    for name in all_modules:
++        path = name.split('.')
++        arcadia_rootmodules_cache.add(path[0])
++
++        prefix = path[0]
++        for element in path[1:]:
++            if element == '__init__':
++                continue
++
++            arcadia_modules_cache.setdefault(prefix, set()).add(element)
++            prefix += '.' + element
++
++    arcadia_rootmodules_cache = sorted(arcadia_rootmodules_cache)
++    arcadia_modules_cache = {k: sorted(v) for k, v in arcadia_modules_cache.items()}
++
++
++def arcadia_module_list(mod):
++    if arcadia_modules_cache is None:
++        arcadia_init_cache()
++
++    return arcadia_modules_cache.get(mod, ())
++
++
++def arcadia_get_root_modules():
++    if arcadia_rootmodules_cache is None:
++        arcadia_init_cache()
++
++    return arcadia_rootmodules_cache
++
++
++
+ def module_list(path):
+     """
+     Return the list containing the names of the modules available in the given
+@@ -168,7 +216,8 @@ def try_import(mod, only_modules=False):
+     for module in mods[1:]:
+         m = getattr(m, module)
+ 
+-    m_is_init = hasattr(m, '__file__') and '__init__' in m.__file__
++    filename = getattr(m, '__file__', '')
++    m_is_init = '__init__' in (filename or '') or filename == mod
+ 
+     completions = []
+     if (not hasattr(m, '__file__')) or (not only_modules) or m_is_init:
+@@ -177,10 +226,10 @@ def try_import(mod, only_modules=False):
+ 
+     completions.extend(getattr(m, '__all__', []))
+     if m_is_init:
+-        completions.extend(module_list(os.path.dirname(m.__file__)))
++        completions.extend(arcadia_module_list(mod))
+     completions = {c for c in completions if isinstance(c, string_types)}
+     completions.discard('__init__')
+-    return list(completions)
++    return sorted(completions)
+ 
+ 
+ #-----------------------------------------------------------------------------
+@@ -229,10 +278,10 @@ def module_completion(line):
+     # 'from xy<tab>' or 'import xy<tab>'
+     if nwords < 3 and (words[0] in {'%aimport', 'import', 'from'}) :
+         if nwords == 1:
+-            return get_root_modules()
++            return arcadia_get_root_modules()
+         mod = words[1].split('.')
+         if len(mod) < 2:
+-            return get_root_modules()
++            return arcadia_get_root_modules()
+         completion_list = try_import('.'.join(mod[:-1]), True)
+         return ['.'.join(mod[:-1] + [el]) for el in completion_list]
+ 
+--- contrib/python/ipython/py2/IPython/core/extensions.py	(index)
++++ contrib/python/ipython/py2/IPython/core/extensions.py	(working tree)
+@@ -75,11 +75,11 @@ class ExtensionManager(Configurable):
+         if module_str in self.loaded:
+             return "already loaded"
+         
+-        from IPython.utils.syspathcontext import prepended_to_syspath
+-        
+         with self.shell.builtin_trap:
+             if module_str not in sys.modules:
+-                with prepended_to_syspath(self.ipython_extension_dir):
++                try:
++                    sys.modules[module_str] = __import__('IPython.extensions.' + module_str)
++                except ImportError:
+                     __import__(module_str)
+             mod = sys.modules[module_str]
+             if self._call_load_ipython_extension(mod):
+--- contrib/python/ipython/py2/IPython/core/profiledir.py	(index)
++++ contrib/python/ipython/py2/IPython/core/profiledir.py	(working tree)
+@@ -112,13 +112,11 @@ class ProfileDir(LoggingConfigurable):
+         self._mkdir(self.startup_dir)
+ 
+         readme = os.path.join(self.startup_dir, 'README')
+-        src = os.path.join(get_ipython_package_dir(), u'core', u'profile', u'README_STARTUP')
+ 
+-        if not os.path.exists(src):
+-            self.log.warning("Could not copy README_STARTUP to startup dir. Source file %s does not exist.", src)
+-
+-        if os.path.exists(src) and not os.path.exists(readme):
+-            shutil.copy(src, readme)
++        if not os.path.exists(readme):
++            import pkgutil
++            with open(readme, 'wb') as f:
++                f.write(pkgutil.get_data(__name__, 'profile/README_STARTUP'))
+ 
+     @observe('security_dir')
+     def check_security_dir(self, change=None):
diff --git a/contrib/python/ipython/py2/patches/02-fix-ya.make.patch b/contrib/python/ipython/py2/patches/02-fix-ya.make.patch
new file mode 100644
index 0000000000..9a613d6870
--- /dev/null
+++ b/contrib/python/ipython/py2/patches/02-fix-ya.make.patch
@@ -0,0 +1,45 @@
+--- contrib/python/ipython/py2/ya.make	(index)
++++ contrib/python/ipython/py2/ya.make	(working tree)
+@@ -13,7 +11,6 @@ PEERDIR(
+     contrib/python/backports.shutil-get-terminal-size
+     contrib/python/decorator
+     contrib/python/pathlib2
+-    contrib/python/pexpect
+     contrib/python/pickleshare
+     contrib/python/prompt-toolkit
+     contrib/python/setuptools
+@@ -21,6 +18,23 @@ PEERDIR(
+     contrib/python/traitlets
+ )
+ 
++IF (OS_WINDOWS)
++    PEERDIR(
++        contrib/python/colorama
++        contrib/python/win_unicode_console
++    )
++ELSE ()
++    PEERDIR(
++        contrib/python/pexpect
++    )
++ENDIF ()
++
++IF (OS_DARWIN)
++    PEERDIR(
++        contrib/python/appnope
++    )
++ENDIF ()
++
+ NO_LINT()
+ 
+ NO_CHECK_IMPORTS(
+@@ -257,10 +271,6 @@ RESOURCE_FILES(
+     .dist-info/entry_points.txt
+     .dist-info/top_level.txt
+     IPython/core/profile/README_STARTUP
+-    IPython/testing/plugin/README.txt
+-    IPython/testing/plugin/test_combo.txt
+-    IPython/testing/plugin/test_example.txt
+-    IPython/testing/plugin/test_exampleip.txt
+ )
+ 
+ END()
diff --git a/contrib/python/ipython/py2/ya.make b/contrib/python/ipython/py2/ya.make
index c356efb08c..3d100640f9 100644
--- a/contrib/python/ipython/py2/ya.make
+++ b/contrib/python/ipython/py2/ya.make
@@ -1,21 +1,23 @@
+# Generated by devtools/yamaker (pypi).
+
 PY2_LIBRARY()
 
-LICENSE(BSD-3-Clause)
+OWNER(borman nslus g:python-contrib)
 
-VERSION(5.9.0)
+VERSION(5.10.0)
 
-OWNER(g:python-contrib borman nslus)
+LICENSE(BSD-3-Clause)
 
 PEERDIR(
+    contrib/python/Pygments
     contrib/python/backports.shutil-get-terminal-size
     contrib/python/decorator
+    contrib/python/pathlib2
     contrib/python/pickleshare
+    contrib/python/prompt-toolkit
+    contrib/python/setuptools
     contrib/python/simplegeneric
     contrib/python/traitlets
-    contrib/python/path.py
-    contrib/python/pathlib2
-    contrib/python/prompt-toolkit
-    contrib/python/Pygments
 )
 
 IF (OS_WINDOWS)
@@ -35,13 +37,16 @@ IF (OS_DARWIN)
     )
 ENDIF ()
 
-NO_CHECK_IMPORTS(IPython.*)
-
 NO_LINT()
 
+NO_CHECK_IMPORTS(
+    IPython.*
+)
+
 PY_SRCS(
     TOP_LEVEL
     IPython/__init__.py
+    IPython/__main__.py
     IPython/config.py
     IPython/consoleapp.py
     IPython/core/__init__.py
@@ -122,6 +127,7 @@ PY_SRCS(
     IPython/frontend.py
     IPython/html.py
     IPython/kernel/__init__.py
+    IPython/kernel/__main__.py
     IPython/kernel/adapter.py
     IPython/kernel/channels.py
     IPython/kernel/channelsabc.py
@@ -175,8 +181,8 @@ PY_SRCS(
     IPython/terminal/prompts.py
     IPython/terminal/pt_inputhooks/__init__.py
     IPython/terminal/pt_inputhooks/glut.py
-    IPython/terminal/pt_inputhooks/gtk3.py
     IPython/terminal/pt_inputhooks/gtk.py
+    IPython/terminal/pt_inputhooks/gtk3.py
     IPython/terminal/pt_inputhooks/osx.py
     IPython/terminal/pt_inputhooks/pyglet.py
     IPython/terminal/pt_inputhooks/qt.py
@@ -186,6 +192,7 @@ PY_SRCS(
     IPython/terminal/ptutils.py
     IPython/terminal/shortcuts.py
     IPython/testing/__init__.py
+    IPython/testing/__main__.py
     IPython/testing/decorators.py
     IPython/testing/globalipapp.py
     IPython/testing/iptest.py
@@ -202,6 +209,7 @@ PY_SRCS(
     IPython/testing/plugin/test_ipdoctest.py
     IPython/testing/plugin/test_refs.py
     IPython/testing/skipdoctest.py
+    IPython/testing/tools.py
     IPython/utils/PyColorize.py
     IPython/utils/__init__.py
     IPython/utils/_get_terminal_size.py
@@ -262,6 +270,7 @@ PY_SRCS(
 RESOURCE_FILES(
     PREFIX contrib/python/ipython/py2/
     .dist-info/METADATA
+    .dist-info/entry_points.txt
     .dist-info/top_level.txt
     IPython/core/profile/README_STARTUP
 )