[Python-modules-commits] [sphinx-argparse] 10/12: merge patched into master

[ChangZhuo Chen]

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

czchen pushed a commit to branch master
in repository sphinx-argparse.

commit 76a84f454178f42e64af7c47169a7ad7921ce621
Merge: f51ce21 680b731
Author: ChangZhuo Chen (陳昌倬) <czchen at debian.org>
Date:   Sun Jul 2 21:14:43 2017 +0800

    merge patched into master

 debian/.git-dpm                     | 4 ++--
 debian/patches/0001-fix-tests.patch | 6 +++---
 test/test_parser.py                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 9cea4cb,0000000..dfefcc3
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
- f0e90f2f6347869191ff828e960f11213bf3d685
- f0e90f2f6347869191ff828e960f11213bf3d685
++680b7314c75db8aec6fc9b79da6c0b3c8f968459
++680b7314c75db8aec6fc9b79da6c0b3c8f968459
 +72f60cadb98011b937a169422dfe7cbdbc27d931
 +72f60cadb98011b937a169422dfe7cbdbc27d931
 +sphinx-argparse_0.2.1.orig.tar.gz
 +367dc538b0d9fe91de44794878bd0a5937c02021
 +24147
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-tests.patch
index 8173594,0000000..58bc042
mode 100644,000000..100644
--- a/debian/patches/0001-fix-tests.patch
+++ b/debian/patches/0001-fix-tests.patch
@@@ -1,37 -1,0 +1,37 @@@
- From f0e90f2f6347869191ff828e960f11213bf3d685 Mon Sep 17 00:00:00 2001
++From 680b7314c75db8aec6fc9b79da6c0b3c8f968459 Mon Sep 17 00:00:00 2001
 +From: Daniel Stender <debian at danielstender.com>
 +Date: Wed, 20 Jan 2016 21:24:54 +0100
 +Subject: fix-tests
 +
 +fix tests for running py.test via Python interpreter
 +Forwarded: not-needed
 +---
 + test/test_parser.py | 8 ++++----
 + 1 file changed, 4 insertions(+), 4 deletions(-)
 +
 +diff --git a/test/test_parser.py b/test/test_parser.py
- index 075888b..499204b 100755
++index 075888b..47eb05b 100755
 +--- a/test/test_parser.py
 ++++ b/test/test_parser.py
 +@@ -157,8 +157,8 @@ def test_parse_nested():
 +         {
 +             'name': 'install',
 +             'help': 'install help',
 +-            'usage': 'usage: py.test install [-h] [--upgrade] ref',
 +-            'bare_usage': 'py.test install [-h] [--upgrade] ref',
 ++            'usage': 'usage: pytest.py install [-h] [--upgrade] ref',
- +            'bare_usage': 'py.test.py install [-h] [--upgrade] ref',
+++            'bare_usage': 'pytest.py install [-h] [--upgrade] ref',
 +             'action_groups': [
 +                 {
 +                     'title': 'Positional Arguments',
 +@@ -223,8 +223,8 @@ def test_parse_nested_traversal():
 +         {
 +             'name': 'level3',
 +             'help': '',
 +-            'usage': 'usage: py.test level1 level2 level3 [-h] foo bar',
 +-            'bare_usage': 'py.test level1 level2 level3 [-h] foo bar',
 ++            'usage': 'usage: pytest.py level1 level2 level3 [-h] foo bar',
 ++            'bare_usage': 'pytest.py level1 level2 level3 [-h] foo bar',
 +             'action_groups': [
 +                 {
 +                     'title': 'Positional Arguments',

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