[Python-modules-commits] [ipython4] 04/05: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Sun Sep 17 14:30:50 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 c31f1a15fc0475cb2c4b978eb666364624c0b71d
Merge: 876ecdc 291e562
Author: Gordon Ball <gordon at chronitis.net>
Date: Sun Sep 17 16:05:12 2017 +0200
merge patched into master
.gitattributes | 5 -
.gitignore | 23 -
.mailmap | 156 -
.travis.yml | 45 -
CONTRIBUTING.md | 45 -
Dockerfile | 7 -
IPython/core/application.py | 9 +
IPython/core/compilerop.py | 2 +-
IPython/core/completer.py | 13 +-
IPython/core/display.py | 52 +-
IPython/core/interactiveshell.py | 4 +-
IPython/core/magics/basic.py | 8 +-
IPython/core/magics/execution.py | 8 +
IPython/core/pylabtools.py | 5 +-
IPython/core/release.py | 2 +-
IPython/core/shellapp.py | 12 +-
IPython/core/tests/test_display.py | 14 +
IPython/core/tests/test_magic.py | 32 +
IPython/core/tests/test_run.py | 19 +-
IPython/core/ultratb.py | 5 +-
IPython/lib/demo.py | 2 +-
IPython/lib/pretty.py | 30 +-
IPython/sphinxext/ipython_directive.py | 2 +-
IPython/terminal/ipapp.py | 10 +-
IPython/utils/_sysinfo.py | 2 +-
IPython/utils/terminal.py | 2 +-
IPython/utils/tests/test_path.py | 1 +
MANIFEST.in | 36 -
PKG-INFO | 60 +
codecov.yml | 9 -
debian/.git-dpm | 6 +-
...ols-also-for-the-install-target-so-the-py.patch | 4 +-
docs/source/conf.py | 7 -
docs/source/interactive/python-ipython-diff.rst | 6 +-
docs/source/whatsnew/github-stats-5.rst | 26 +
docs/source/whatsnew/index.rst | 1 -
docs/source/whatsnew/pr/progressbar.rst | 10 +
docs/source/whatsnew/version5.rst | 58 +
examples/IPython Kernel/Updating Displays.ipynb | 62 +-
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 -
74 files changed, 357 insertions(+), 15430 deletions(-)
diff --cc debian/.git-dpm
index 261cad0,0000000..4046fdb
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
- b20a6a99ac74b97c98cbe2ab907c05470851c993
- b20a6a99ac74b97c98cbe2ab907c05470851c993
- 77acd4d8fb600a2b3818b6aab98700da290afc6b
++291e562d4b14e4925d9f44f6daade890cddae34d
++291e562d4b14e4925d9f44f6daade890cddae34d
++b2fd16b03c2c3e0c9b68ab3a799a3ab1c72f39c5
+b2fd16b03c2c3e0c9b68ab3a799a3ab1c72f39c5
+ipython_5.5.0.orig.tar.gz
+bd8b3f8dab9522e6f5b581945a056a39efc69739
+4975920
+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 cd31c85,0000000..5316a0b
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 b20a6a99ac74b97c98cbe2ab907c05470851c993 Mon Sep 17 00:00:00 2001
++From 291e562d4b14e4925d9f44f6daade890cddae34d 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 9cbb0ff..60f7aa8 100755
+--- a/setup.py
++++ b/setup.py
- @@ -169,8 +169,7 @@ def run(self):
++@@ -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