[Python-modules-commits] [ipython4] 08/10: merge patched into master
Julien Cristau
jcristau at moszumanska.debian.org
Fri Apr 8 11:12:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcristau pushed a commit to branch master
in repository ipython4.
commit c7650e6ca9f3c12f4b2b2290908c37f11963faa3
Merge: b883b37 72c0564
Author: Julien Cristau <julien.cristau at logilab.fr>
Date: Fri Apr 8 12:51:11 2016 +0200
merge patched into master
IPython/core/alias.py | 1 +
IPython/core/application.py | 28 +-
IPython/core/builtin_trap.py | 2 +-
IPython/core/completer.py | 21 +-
IPython/core/completerlib.py | 2 +-
IPython/core/debugger.py | 86 +-
IPython/core/display.py | 38 +-
IPython/core/excolors.py | 14 +-
IPython/core/extensions.py | 5 -
IPython/core/formatters.py | 2 +
IPython/core/history.py | 10 +-
IPython/core/inputtransformer.py | 18 +-
IPython/core/interactiveshell.py | 247 +-
IPython/core/magic.py | 6 +-
IPython/core/magics/basic.py | 29 +-
IPython/core/magics/code.py | 10 +
IPython/core/magics/deprecated.py | 5 +-
IPython/core/magics/display.py | 7 +-
IPython/core/magics/execution.py | 24 +-
IPython/core/magics/extension.py | 4 +-
IPython/core/magics/osm.py | 10 +-
IPython/core/oinspect.py | 44 +-
IPython/core/profileapp.py | 2 +-
IPython/core/profiledir.py | 4 +-
IPython/core/prompts.py | 120 +-
IPython/core/pylabtools.py | 36 +-
IPython/core/release.py | 14 +-
IPython/core/shellapp.py | 34 +-
.../tests/{ => daft_extension}/daft_extension.py | 0
IPython/core/tests/test_completer.py | 20 +-
IPython/core/tests/test_completerlib.py | 12 +-
IPython/core/tests/test_debugger.py | 29 +
IPython/core/tests/test_display.py | 3 +
IPython/core/tests/test_inputsplitter.py | 2 +-
IPython/core/tests/test_inputtransformer.py | 13 +
IPython/core/tests/test_interactiveshell.py | 15 +-
IPython/core/tests/test_magic.py | 30 +-
IPython/core/tests/test_oinspect.py | 41 +
IPython/core/tests/test_profile.py | 2 +-
IPython/core/tests/test_prompts.py | 24 +-
IPython/core/tests/test_pylabtools.py | 48 +-
IPython/core/tests/test_ultratb.py | 144 +
IPython/core/ultratb.py | 488 +-
IPython/extensions/autoreload.py | 2 +-
IPython/external/mathjax.py | 234 +-
IPython/external/qt_for_kernel.py | 51 +-
IPython/external/qt_loaders.py | 18 +-
IPython/lib/deepreload.py | 5 +-
IPython/lib/display.py | 14 +
IPython/lib/kernel.py | 3 +-
IPython/lib/latextools.py | 10 +-
IPython/lib/lexers.py | 1 +
IPython/lib/pretty.py | 27 +-
IPython/lib/tests/test_lexers.py | 15 +-
IPython/lib/tests/test_pretty.py | 82 +-
IPython/nbconvert.py | 2 +-
IPython/sphinxext/ipython_console_highlighting.py | 3 +-
IPython/sphinxext/ipython_directive.py | 19 +-
IPython/terminal/embed.py | 24 +-
IPython/terminal/interactiveshell.py | 213 +-
IPython/terminal/ipapp.py | 48 +-
IPython/testing/decorators.py | 12 +-
IPython/testing/iptest.py | 38 +-
IPython/testing/iptestcontroller.py | 2 +-
IPython/testing/plugin/ipdoctest.py | 4 +-
IPython/utils/PyColorize.py | 31 +-
IPython/utils/{signatures.py => _signatures.py} | 0
IPython/utils/_sysinfo.py | 2 +-
IPython/utils/coloransi.py | 2 +-
IPython/utils/contexts.py | 25 +-
IPython/utils/dir2.py | 2 +-
IPython/utils/frame.py | 2 +-
IPython/utils/io.py | 2 +
IPython/utils/py3compat.py | 7 +-
IPython/utils/signatures.py | 818 +-
IPython/utils/tests/test_pycolorize.py | 54 +-
IPython/utils/tests/test_text.py | 71 +-
IPython/utils/tests/test_tokenutil.py | 19 +
IPython/utils/text.py | 83 +-
IPython/utils/tokenutil.py | 23 +-
PKG-INFO | 7 +-
README.rst | 4 +-
debian/.git-dpm | 6 +-
...ols-also-for-the-install-target-so-the-py.patch | 6 +-
docs/Makefile | 9 +-
docs/requirements.txt | 2 +-
docs/source/_static/favicon.ico | Bin 0 -> 1430 bytes
docs/source/conf.py | 5 +-
docs/source/config/callbacks.rst | 55 +-
docs/source/config/custommagics.rst | 3 +-
docs/source/config/extensions/index.rst | 8 +-
docs/source/coredev/index.rst | 18 +
docs/source/coredev/release_process.rst | 185 +
docs/source/development/figs/allconnections.png | Bin 32144 -> 0 bytes
docs/source/development/figs/allconnections.svg | 4012 -------
docs/source/development/figs/hbfade.png | Bin 38554 -> 0 bytes
docs/source/development/figs/iopubfade.png | Bin 39136 -> 0 bytes
docs/source/development/figs/nbconvert.png | Bin 23877 -> 0 bytes
docs/source/development/figs/nbconvert.svg | 195 -
.../development/figs/notebook_components.png | Bin 30974 -> 0 bytes
.../development/figs/notebook_components.svg | 596 -
docs/source/development/figs/notiffade.png | Bin 37583 -> 0 bytes
docs/source/development/figs/queryfade.png | Bin 38260 -> 0 bytes
docs/source/development/figs/queuefade.png | Bin 40459 -> 0 bytes
docs/source/development/how_ipython_works.rst | 45 +-
docs/source/development/index.rst | 25 +-
docs/source/development/kernels.rst | 143 +-
docs/source/development/parallel_connections.rst | 152 +-
docs/source/development/parallel_messages.rst | 367 +-
docs/source/development/wrapperkernels.rst | 10 +-
docs/source/index.rst | 9 +-
docs/source/install/kernel_install.rst | 60 +-
docs/source/interactive/index.rst | 2 +-
docs/source/interactive/plotting.rst | 2 +-
docs/source/interactive/python-ipython-diff.rst | 249 +
docs/source/interactive/qtconsole.rst | 654 -
docs/source/interactive/reference.rst | 63 +
docs/source/overview.rst | 8 +-
docs/source/whatsnew/development.rst | 4 +-
docs/source/whatsnew/github-stats-4.rst | 67 +
docs/source/whatsnew/version0.11.rst | 2 +-
docs/source/whatsnew/version4.rst | 31 +-
docs/sphinxext/github.py | 6 +-
docs/sphinxext/magics.py | 3 +
.../distributed-checkpoint.ipynb | 144 +
.../Custom Display Logic-checkpoint.ipynb | 737 ++
.../.ipynb_checkpoints/Untitled-checkpoint.ipynb | 6 +
.../Importing Notebooks.ipynb | 320 +-
examples/IPython Kernel/Index.ipynb | 5 +-
examples/IPython Kernel/Rich Output.ipynb | 6 +-
examples/IPython Kernel/Untitled.ipynb | 74 +
.../nbpackage/__init__.py | 0
.../nbpackage/mynotebook.ipynb | 0
.../nbpackage/nbs/__init__.py | 0
.../nbpackage/nbs/other.ipynb | 0
examples/Index.ipynb | 6 +-
.../Interactive Widgets/Beat Frequencies.ipynb | 120 -
.../Custom Widget - Hello World.ipynb | 793 --
.../Interactive Widgets/Date Picker Widget.ipynb | 838 --
.../Interactive Widgets/Exploring Graphs.ipynb | 117 -
.../Interactive Widgets/Export As (nbconvert).html | 11882 -------------------
.../Export As (nbconvert).ipynb | 186 -
examples/Interactive Widgets/Factoring.ipynb | 115 -
.../Interactive Widgets/File Upload Widget.ipynb | 187 -
examples/Interactive Widgets/Image Browser.ipynb | 119 -
.../Interactive Widgets/Image Processing.ipynb | 162 -
examples/Interactive Widgets/Index.ipynb | 108 -
.../Lorenz Differential Equations.ipynb | 290 -
.../Interactive Widgets/Nonblocking Console.ipynb | 239 -
examples/Interactive Widgets/Using Interact.ipynb | 629 -
.../Interactive Widgets/Variable Inspector.ipynb | 240 -
examples/Interactive Widgets/Widget Basics.ipynb | 445 -
examples/Interactive Widgets/Widget Events.ipynb | 383 -
examples/Interactive Widgets/Widget List.ipynb | 621 -
examples/Interactive Widgets/Widget Styling.ipynb | 585 -
.../images/MultilanguageKernels.graffle | 442 -
.../images/MultilanguageKernels.png | Bin 22608 -> 0 bytes
.../images/ParallelKernels.graffle | 876 --
.../Interactive Widgets/images/ParallelKernels.png | Bin 38764 -> 0 bytes
.../images/VizInteractCompute.graffle | 426 -
.../images/VizInteractCompute.png | Bin 30013 -> 0 bytes
.../Interactive Widgets/images/WidgetArch.graffle | 322 -
examples/Interactive Widgets/images/WidgetArch.png | Bin 23058 -> 0 bytes
.../images/WidgetModelView.graffle | 523 -
.../Interactive Widgets/images/WidgetModelView.png | Bin 38681 -> 0 bytes
.../Configuring the Notebook and Server.ipynb | 295 -
.../Notebook/Connecting with the Qt Console.ipynb | 132 -
.../Converting Notebooks With nbconvert.ipynb | 317 -
examples/Notebook/Custom Keyboard Shortcuts.ipynb | 113 -
examples/Notebook/Index.ipynb | 91 -
.../Notebook/JavaScript Notebook Extensions.ipynb | 612 -
examples/Notebook/Notebook Basics.ipynb | 313 -
examples/Notebook/Running Code.ipynb | 289 -
examples/Notebook/Typesetting Equations.ipynb | 271 -
.../Notebook/Using nbconvert as a Library.ipynb | 619 -
.../Notebook/What is the IPython Notebook.ipynb | 183 -
.../Notebook/Working With Markdown Cells.ipynb | 320 -
examples/Notebook/images/command_mode.png | Bin 6021 -> 0 bytes
examples/Notebook/images/dashboard_files_tab.png | Bin 116878 -> 0 bytes
.../Notebook/images/dashboard_files_tab_btns.png | Bin 13356 -> 0 bytes
.../Notebook/images/dashboard_files_tab_new.png | Bin 33908 -> 0 bytes
.../Notebook/images/dashboard_files_tab_run.png | Bin 85527 -> 0 bytes
examples/Notebook/images/dashboard_running_tab.png | Bin 211313 -> 0 bytes
examples/Notebook/images/edit_mode.png | Bin 6030 -> 0 bytes
examples/Notebook/images/menubar_toolbar.png | Bin 30328 -> 0 bytes
examples/Notebook/images/nbconvert_arch.png | Bin 114431 -> 0 bytes
examples/distributed.ipynb | 144 +
setup.py | 17 +-
setupbase.py | 15 +-
189 files changed, 3889 insertions(+), 32463 deletions(-)
diff --cc debian/.git-dpm
index 2194b2b,0000000..8b97889
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 5d56dbb68f77a074f304bd4ff3a18961c7740994
- 5d56dbb68f77a074f304bd4ff3a18961c7740994
- db354d7e8a8f01ad1689c09c5c4c085c712425d9
++72c0564d55d7f66d6ee2699c27bd0428d8b92cc9
++72c0564d55d7f66d6ee2699c27bd0428d8b92cc9
++d2cc497c43f9f6a338952997f21c3f4b0ee4beb1
+d2cc497c43f9f6a338952997f21c3f4b0ee4beb1
+ipython_4.1.2.orig.tar.gz
+1dc1bca1da98273114844e94383c385109a26188
+4953949
diff --cc debian/patches/0001-use-setuptools-also-for-the-install-target-so-the-py.patch
index e6ddf32,0000000..b095691
mode 100644,000000..100644
--- a/debian/patches/0001-use-setuptools-also-for-the-install-target-so-the-py.patch
+++ b/debian/patches/0001-use-setuptools-also-for-the-install-target-so-the-py.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 5d56dbb68f77a074f304bd4ff3a18961c7740994 Mon Sep 17 00:00:00 2001
++From 72c0564d55d7f66d6ee2699c27bd0428d8b92cc9 Mon Sep 17 00:00:00 2001
+From: Julien Puydt <Julien Puydt>
+Date: Fri, 8 Apr 2016 12:49:16 +0200
+Subject: use setuptools also for the install target so the python*:Depends
+ substitutions work
+
+Forwarded: no
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 0662a7f..45fc2f9 100755
++index cc4f1e6..30e5942 100755
+--- a/setup.py
++++ b/setup.py
- @@ -170,8 +170,7 @@ needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
++@@ -169,8 +169,7 @@ needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
+ 'egg_info', 'easy_install', 'upload', 'install_egg_info',
+ ))
+
+-if len(needs_setuptools.intersection(sys.argv)) > 0:
+- import setuptools
++import setuptools
+
+ # This dict is used for passing extra arguments that are setuptools
+ # specific to setup
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ipython4.git
More information about the Python-modules-commits
mailing list