[Python-modules-commits] [sphinx-argparse] 05/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 db359d8220d84810de524b30145467b1da82b0e4
Merge: 4c42c63 72f60ca
Author: ChangZhuo Chen (陳昌倬) <czchen at debian.org>
Date:   Sun Jul 2 20:56:12 2017 +0800

    merge patched into master

 .gitignore                          |   1 +
 .travis.yml                         |  15 +-
 README.md                           |  70 ++++--
 debian/.git-dpm                     |   6 +-
 debian/patches/0001-fix-tests.patch |  44 ----
 debian/patches/series               |   1 -
 docs/conf.py                        |  12 +-
 docs/contrib.rst                    |  25 +--
 docs/extend.rst                     |  49 ++---
 docs/index.rst                      |  11 +-
 docs/install.rst                    |  11 +-
 docs/markdown.rst                   | 104 +++++++++
 docs/misc.rst                       |  27 +++
 docs/sample.rst                     |  45 ++--
 docs/usage.rst                      |  56 +++--
 requirements.txt                    |   0
 requirements_dev.txt                |   1 +
 requirements_rtd.txt                |   3 +
 setup.py                            |  27 ++-
 sphinxarg/__init__.py               |   1 +
 sphinxarg/ext.py                    | 426 +++++++++++++++++++++++-------------
 sphinxarg/markdown.py               | 398 +++++++++++++++++++++++++++++++++
 sphinxarg/parser.py                 | 167 +++++++++-----
 test/sample.py                      |  23 +-
 test/sample2.py                     |  11 +
 test/test_parser.py                 | 236 ++++++++++++++------
 26 files changed, 1292 insertions(+), 478 deletions(-)

diff --cc debian/.git-dpm
index 1e2d19d,0000000..4670c8c
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
- 8a6a275c5a0a23fb466d6fa53da968e9096a8676
- 8a6a275c5a0a23fb466d6fa53da968e9096a8676
- 2942075e807dfb9430f3740e43fc44df1f18302d
++72f60cadb98011b937a169422dfe7cbdbc27d931
++72f60cadb98011b937a169422dfe7cbdbc27d931
++72f60cadb98011b937a169422dfe7cbdbc27d931
 +72f60cadb98011b937a169422dfe7cbdbc27d931
 +sphinx-argparse_0.2.1.orig.tar.gz
 +367dc538b0d9fe91de44794878bd0a5937c02021
 +24147
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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