[Python-modules-commits] [numpydoc] 03/04: merge patched into master

[Denis Laxalde]

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

dlax-guest pushed a commit to branch master
in repository numpydoc.

commit 48fcc7cb01ff8c2857426a0e3759a139e7bd3ae5
Merge: 7e19a16 bde5951
Author: Denis Laxalde <denis at laxalde.org>
Date:   Wed Oct 21 21:40:18 2015 +0200

    merge patched into master

 LICENSE.txt                                        |   7 +-
 MANIFEST.in                                        |   2 +-
 PKG-INFO                                           |   7 +-
 README.txt => README.rst                           |  12 ++
 __init__.py                                        |   1 -
 debian/.git-dpm                                    |   6 +-
 debian/patches/clean-setup.patch                   |  48 -----
 debian/patches/series                              |   1 -
 numpydoc.egg-info/PKG-INFO                         |   7 +-
 numpydoc.egg-info/SOURCES.txt                      |  30 +--
 numpydoc.egg-info/entry_points.txt                 |   3 -
 numpydoc.egg-info/not-zip-safe                     |   1 -
 numpydoc.egg-info/requires.txt                     |   1 -
 numpydoc/__init__.py                               |   3 +
 comment_eater.py => numpydoc/comment_eater.py      |  19 +-
 .../compiler_unparse.py                            |  27 +--
 docscrape.py => numpydoc/docscrape.py              |  77 +++++---
 .../docscrape_sphinx.py                            |  97 +++++++---
 numpydoc/linkcode.py                               |  83 +++++++++
 numpydoc.py => numpydoc/numpydoc.py                |  73 +++++---
 phantom_import.py => numpydoc/phantom_import.py    |   9 +-
 plot_directive.py => numpydoc/plot_directive.py    | 117 +++++++-----
 {tests => numpydoc/tests}/test_docscrape.py        | 204 ++++++++++++++++++---
 numpydoc/tests/test_linkcode.py                    |   5 +
 numpydoc/tests/test_phantom_import.py              |  12 ++
 numpydoc/tests/test_plot_directive.py              |  11 ++
 numpydoc/tests/test_traitsdoc.py                   |  11 ++
 traitsdoc.py => numpydoc/traitsdoc.py              |  14 +-
 setup.py                                           |  13 +-
 29 files changed, 645 insertions(+), 256 deletions(-)

diff --cc debian/.git-dpm
index 1166ef4,0000000..68c1d03
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
- 446578f8a7218413dc0bdc45cd004706bc9746a5
- 446578f8a7218413dc0bdc45cd004706bc9746a5
- f2defeffe2e11b262bbe5a379f3c962e79523c8e
++bde59512f89b264e6bb00cc9f353bbdf177bf18b
++bde59512f89b264e6bb00cc9f353bbdf177bf18b
++bde59512f89b264e6bb00cc9f353bbdf177bf18b
 +bde59512f89b264e6bb00cc9f353bbdf177bf18b
 +numpydoc_0.5.orig.tar.gz
 +5ac7ae0122669dc457d5abba1f9b81f03098bd38
 +32051
 +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/numpydoc.git