[Python-modules-commits] [ipython4] 04/14: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Sat Jun 24 13:39:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
chronitis-guest pushed a commit to branch master
in repository ipython4.
commit f05da0e90c6ca455e57f38d817ed83b7a8f90af0
Merge: 5fa66cb b20a6a9
Author: Gordon Ball <gordon at chronitis.net>
Date: Sat Jun 24 11:18:50 2017 +0200
merge patched into master
.gitattributes | 5 +
.gitignore | 23 +
.mailmap | 156 +
.travis.yml | 45 +
CONTRIBUTING.md | 45 +
Dockerfile | 7 +
IPython/config.py | 2 +-
IPython/core/completer.py | 69 +-
IPython/core/completerlib.py | 6 +
IPython/core/debugger.py | 55 +-
IPython/core/display.py | 244 +-
IPython/core/displayhook.py | 16 +-
IPython/core/displaypub.py | 16 +-
IPython/core/excolors.py | 10 +-
IPython/core/formatters.py | 110 +-
IPython/core/history.py | 3 +-
IPython/core/hooks.py | 2 +-
IPython/core/inputtransformer.py | 30 +-
IPython/core/interactiveshell.py | 17 +-
IPython/core/magics/basic.py | 39 +-
IPython/core/magics/execution.py | 7 +-
IPython/core/magics/script.py | 8 +
IPython/core/oinspect.py | 14 +-
IPython/core/pylabtools.py | 39 +-
IPython/core/release.py | 6 +-
IPython/core/tests/test_completer.py | 7 +
IPython/core/tests/test_display.py | 140 +
IPython/core/tests/test_formatters.py | 98 +-
IPython/core/tests/test_inputtransformer.py | 5 +
IPython/core/tests/test_oinspect.py | 29 +-
IPython/core/tests/test_paths.py | 2 +-
IPython/core/tests/test_run.py | 9 +-
IPython/core/ultratb.py | 6 +
IPython/core/usage.py | 34 +-
IPython/extensions/autoreload.py | 4 +-
IPython/external/qt_for_kernel.py | 7 +-
IPython/external/qt_loaders.py | 108 +-
IPython/frontend.py | 2 +-
IPython/html.py | 2 +-
IPython/kernel/__init__.py | 2 +-
IPython/lib/deepreload.py | 3 +-
IPython/lib/display.py | 8 +-
IPython/lib/editorhooks.py | 2 +-
IPython/lib/guisupport.py | 27 +-
IPython/lib/inputhook.py | 4 +-
IPython/lib/tests/test_deepreload.py | 29 +-
IPython/lib/tests/test_editorhooks.py | 1 +
IPython/nbconvert.py | 2 +-
IPython/nbformat.py | 2 +-
IPython/parallel.py | 2 +-
IPython/qt.py | 2 +-
IPython/sphinxext/ipython_directive.py | 24 +-
IPython/terminal/console.py | 2 +-
IPython/terminal/debugger.py | 45 +-
IPython/terminal/embed.py | 121 +-
IPython/terminal/interactiveshell.py | 112 +-
IPython/terminal/ipapp.py | 11 +-
IPython/terminal/magics.py | 5 +-
IPython/terminal/prompts.py | 14 +-
IPython/terminal/pt_inputhooks/__init__.py | 13 +-
IPython/terminal/pt_inputhooks/osx.py | 6 -
IPython/terminal/pt_inputhooks/qt.py | 11 +-
IPython/terminal/ptutils.py | 17 +-
IPython/terminal/shortcuts.py | 25 +-
IPython/terminal/tests/test_interactivshell.py | 36 +-
IPython/testing/decorators.py | 20 +-
IPython/testing/iptest.py | 10 +
IPython/testing/tools.py | 43 +-
IPython/utils/_get_terminal_size.py | 131 +
IPython/utils/_sysinfo.py | 2 +-
IPython/utils/capture.py | 6 +-
IPython/utils/io.py | 7 +-
IPython/utils/path.py | 17 +-
IPython/utils/terminal.py | 7 +-
IPython/utils/tests/test_io.py | 18 +-
MANIFEST.in | 36 +
PKG-INFO | 60 -
codecov.yml | 9 +
debian/.git-dpm | 6 +-
...ols-also-for-the-install-target-so-the-py.patch | 6 +-
docs/Makefile | 2 +-
docs/autogen_shortcuts.py | 3 +-
docs/source/api/index.rst | 2 +-
docs/source/conf.py | 10 +-
docs/source/config/details.rst | 7 +-
docs/source/config/extensions/index.rst | 2 +-
docs/source/coredev/release_process.rst | 19 +-
docs/source/development/wrapperkernels.rst | 2 +-
docs/source/index.rst | 4 +-
docs/source/install/install.rst | 14 +-
docs/source/interactive/plotting.rst | 25 +
docs/source/interactive/reference.rst | 46 +-
docs/source/overview.rst | 2 +-
docs/source/whatsnew/development.rst | 1 -
docs/source/whatsnew/github-stats-0.13.rst | 4 +-
docs/source/whatsnew/github-stats-4.rst | 2 +-
docs/source/whatsnew/github-stats-5.rst | 104 +
docs/source/whatsnew/version3.rst | 2 +-
docs/source/whatsnew/version5.rst | 156 +
examples/IPython Kernel/Custom Display Logic.ipynb | 1058 +--
examples/IPython Kernel/Updating Displays.ipynb | 359 +
setup.py | 8 +-
tools/alldeps/Makefile | 130 +
tools/alldeps/README.txt | 109 +
tools/alldeps/pkginstall | 119 +
tools/alldeps/pkginstall.cfg | 27 +
tools/backport_pr.py | 189 +
tools/build_release | 29 +
tools/check_sources.py | 55 +
tools/gen_latex_symbols.py | 89 +
tools/gh_api.py | 303 +
tools/git-mpr.py | 128 +
tools/git-mrb | 80 +
tools/github_stats.py | 231 +
tools/make_tarball.py | 22 +
tools/mknbindex.py | 36 +
tools/post_pr_test.py | 13 +
tools/release | 94 +
tools/test_pr.py | 289 +
tools/tests/ANSI Test.ipynb | 560 ++
tools/tests/CSS Reference.ipynb | 8193 ++++++++++++++++++++
tools/tests/Confined Output.ipynb | 307 +
tools/tests/Markdown Pandoc Limitations.ipynb | 2691 +++++++
tools/tests/Test Output Callbacks.ipynb | 291 +
tools/tests/embed/embed1.py | 10 +
tools/tests/embed/embed2.py | 5 +
tools/tests/embed/embed3.py | 7 +
tools/tests/embed/embed_division.py | 5 +
tools/tests/embed/embed_no_division.py | 6 +
tools/tests/heartbeat/gilsleep.ipynb | 72 +
tools/tests/heartbeat/hb_gil.py | 31 +
tools/tests/inline_figshow.py | 23 +
tools/tests/mpl-switch/Matplotlib Switching.ipynb | 654 ++
tools/testupload | 22 +
tools/toollib.py | 57 +
tools/update_whatsnew.py | 82 +
tox.ini | 28 +
137 files changed, 17760 insertions(+), 1390 deletions(-)
diff --cc debian/.git-dpm
index 67c5434,0000000..c00cedc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 74f842a50dbf87972a45073838fbf9bd0b071d06
- 74f842a50dbf87972a45073838fbf9bd0b071d06
- 758dee70edaeb8968ea8f65d4689bd8a87d97be3
++b20a6a99ac74b97c98cbe2ab907c05470851c993
++b20a6a99ac74b97c98cbe2ab907c05470851c993
++77acd4d8fb600a2b3818b6aab98700da290afc6b
+77acd4d8fb600a2b3818b6aab98700da290afc6b
+ipython_5.4.0.orig.tar.gz
+82fb911bc92a33a345fef94abc27f06462337f17
+5525941
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-setuptools-also-for-the-install-target-so-the-py.patch
index a4a1a78,0000000..cd31c85
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 74f842a50dbf87972a45073838fbf9bd0b071d06 Mon Sep 17 00:00:00 2001
++From b20a6a99ac74b97c98cbe2ab907c05470851c993 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 d23d5eb..e8043a3 100755
++index 9cbb0ff..60f7aa8 100755
+--- a/setup.py
++++ b/setup.py
- @@ -169,8 +169,7 @@ needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
++@@ -169,8 +169,7 @@ def run(self):
+ '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