[Python-modules-commits] [pytest-mock] 03/05: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository pytest-mock.

commit 6e13094e303414caf2d6bf0c4d0c367b957d7129
Merge: 144bb26 cc3055e
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Nov 1 20:04:26 2016 +0100

    merge patched into master

 .gitignore                                         |   58 ++
 .travis.yml                                        |   25 +
 CHANGELOG.rst                                      |  214 +++++
 LICENSE                                            |   40 +-
 MANIFEST.in                                        |    2 +-
 PKG-INFO                                           |  566 +++++------
 README.rst                                         |  519 +++++-----
 _pytest_mock_version.py                            |    4 +
 appveyor.yml                                       |    7 +
 debian/.git-dpm                                    |    6 +-
 .../0001-Update-tests-to-work-with-pytest-3.patch  |   31 -
 debian/patches/series                              |    1 -
 pytest_mock.egg-info/PKG-INFO                      |  566 +++++------
 pytest_mock.egg-info/SOURCES.txt                   |    6 +
 pytest_mock.egg-info/top_level.txt                 |    1 +
 pytest_mock.py                                     |  522 +++++-----
 setup.cfg                                          |   16 +-
 setup.py                                           |   88 +-
 test_pytest_mock.py                                | 1000 ++++++++++----------
 tox.ini                                            |   24 +
 20 files changed, 2006 insertions(+), 1690 deletions(-)

diff --cc debian/.git-dpm
index 4d19828,0000000..4bb381d
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
- f13872e1a5118d1d13b2541988105376e9502527
- f13872e1a5118d1d13b2541988105376e9502527
- bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
++cc3055ebc382be373ea9f1bc593cffcd6980f178
++cc3055ebc382be373ea9f1bc593cffcd6980f178
++cc3055ebc382be373ea9f1bc593cffcd6980f178
 +cc3055ebc382be373ea9f1bc593cffcd6980f178
 +pytest-mock_1.3.0.orig.tar.gz
 +01f46143fa07287fcb85602b61b2fa62f3fcbfab
 +16149
 +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/pytest-mock.git