[Python-modules-commits] [jupyter-core] 09/12: merge patched into master

[Julien Cristau]

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

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

commit b37c0f85bbedb1aef9a058be98c1d6c0255dce39
Merge: b19a732 9983b6b
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 11:11:25 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...encoding-declaration-to-top-of-file-so-it.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 jupyter_core/tests/test_migrate.py                 |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a7b4909,0000000..b97f1c3
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
- 002e8e775639e872fab6ef3ea3f28b49c2f9b6f6
- 002e8e775639e872fab6ef3ea3f28b49c2f9b6f6
++9983b6bb0b28d11d27f77b1d3c7b6a8217b52c49
++9983b6bb0b28d11d27f77b1d3c7b6a8217b52c49
 +d48348ce954c43313119bf18eb71f8b4e66d5ee5
 +d48348ce954c43313119bf18eb71f8b4e66d5ee5
 +jupyter-core_4.1.0.orig.tar.gz
 +7836ef4bbe750048361624c6a3968ed733bf8f6a
 +56500
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-tests-move-encoding-declaration-to-top-of-file-so-it.patch
index 0000000,0000000..b0124a8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-tests-move-encoding-declaration-to-top-of-file-so-it.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 9983b6bb0b28d11d27f77b1d3c7b6a8217b52c49 Mon Sep 17 00:00:00 2001
++From: Julien Cristau <julien.cristau at logilab.fr>
++Date: Fri, 8 Apr 2016 11:10:43 +0200
++Subject: tests: move encoding declaration to top of file so it actually works
++
++Signed-off-by: Julien Cristau <julien.cristau at logilab.fr>
++---
++ jupyter_core/tests/test_migrate.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/jupyter_core/tests/test_migrate.py b/jupyter_core/tests/test_migrate.py
++index 799da33..dab55d3 100644
++--- a/jupyter_core/tests/test_migrate.py
+++++ b/jupyter_core/tests/test_migrate.py
++@@ -1,7 +1,7 @@
++-"""Test config file migration"""
++ # coding: utf-8
++ # Copyright (c) Jupyter Development Team.
++ # Distributed under the terms of the Modified BSD License.
+++"""Test config file migration"""
++ 
++ import os
++ import re
diff --cc debian/patches/series
index fbe9269,0000000..021743a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
++0002-tests-move-encoding-declaration-to-top-of-file-so-it.patch

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