[Python-modules-commits] [jupyter-core] 05/10: merge patched into master

[Gordon Ball]

This is an automated email from the git hooks/post-receive script.

chronitis-guest pushed a commit to branch master
in repository jupyter-core.

commit 5a673fffea577ef1a17a65656759a202ff8bc597
Merge: 28896b4 5399289
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Nov 2 10:41:00 2017 +0000

    merge patched into master

 .travis.yml                                        | 19 ++++---
 CONTRIBUTING.md                                    |  2 +
 README.md                                          | 34 +++++++++++++
 debian/.git-dpm                                    |  6 +--
 ...ols-for-everything-so-the-python-Depends-.patch |  4 +-
 ...FIG_PATH-for-Debian-systems-we-never-use-.patch |  2 +-
 dev-requirements.txt                               |  2 +-
 docs/changelog.rst                                 | 23 ++++++++-
 docs/conf.py                                       |  5 +-
 docs/requirements.txt                              |  1 +
 examples/completions-zsh                           |  2 +-
 jupyter_core/application.py                        |  7 ++-
 jupyter_core/migrate.py                            | 26 ++++++----
 jupyter_core/tests/test_command.py                 | 58 ++++++++++++++++------
 jupyter_core/tests/test_migrate.py                 |  6 +--
 jupyter_core/troubleshoot.py                       |  2 +-
 jupyter_core/utils/__init__.py                     | 18 +++++++
 jupyter_core/version.py                            |  2 +-
 setup.py                                           |  2 +-
 19 files changed, 166 insertions(+), 55 deletions(-)

diff --cc debian/.git-dpm
index bd96816,0000000..1998085
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
- affc3551e01283abea845ed7730e24bd02f5d3d6
- affc3551e01283abea845ed7730e24bd02f5d3d6
- 469b50497c796b9d98e31bde6836e17a846add92
++53992894b57902053c2537d97a4d0806b5a32807
++53992894b57902053c2537d97a4d0806b5a32807
++0a51b77abfb635f7e6ed76c012e80d094854ba08
 +0a51b77abfb635f7e6ed76c012e80d094854ba08
 +jupyter-core_4.4.0.orig.tar.gz
 +04fe74c545381a0b6894cdb840189adf09090072
 +59781
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
index 27b78af,0000000..669c503
mode 100644,000000..100644
--- a/debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
+++ b/debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
@@@ -1,25 -1,0 +1,25 @@@
- From d02ff1d260d4a9da1225be47e063c1476c1a8430 Mon Sep 17 00:00:00 2001
++From bdf22735c996d951a0a0b24c0fe9fff4dca8e01c Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:21:43 +0200
 +Subject: Use setuptools for everything (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 f041234..a0c89f3 100644
++index 5015fe2..8df5ffa 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -74,8 +74,7 @@ setup_args = dict(
 +     ],
 + )
 + 
 +-if any(arg.startswith('bdist') for arg in sys.argv):
 +-    import setuptools
 ++import setuptools
 + 
 + setuptools_args = {}
 + 
diff --cc debian/patches/0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
index b603fa6,0000000..621b5a2
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
+++ b/debian/patches/0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
@@@ -1,22 -1,0 +1,22 @@@
- From affc3551e01283abea845ed7730e24bd02f5d3d6 Mon Sep 17 00:00:00 2001
++From 53992894b57902053c2537d97a4d0806b5a32807 Mon Sep 17 00:00:00 2001
 +From: Ximin Luo <infinity0 at debian.org>
 +Date: Sat, 3 Dec 2016 15:21:44 +0100
 +Subject: Fix ENV_CONFIG_PATH for Debian systems, we never use /usr/etc
 +
 +---
 + jupyter_core/paths.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/jupyter_core/paths.py b/jupyter_core/paths.py
 +index ad46e00..289ba29 100644
 +--- a/jupyter_core/paths.py
 ++++ b/jupyter_core/paths.py
 +@@ -174,7 +174,7 @@ else:
 +         "/etc/jupyter",
 +     ]
 + 
 +-ENV_CONFIG_PATH = [os.path.join(sys.prefix, 'etc', 'jupyter')]
 ++ENV_CONFIG_PATH = [os.path.join('/etc', 'jupyter')]
 + 
 + 
 + def jupyter_config_path():

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/jupyter-core.git