[Python-modules-commits] [python-mock] 04/12: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository python-mock.

commit c67071d8f9754647bf07494e2c7974ec07b52e27
Merge: 7d70754 6811a9d
Author: Ondřej Nový <novy at ondrej.org>
Date:   Tue Jun 7 12:01:25 2016 +0200

    merge patched into master

 .travis.yml                                        |  3 +-
 AUTHORS                                            |  6 ++
 ChangeLog                                          | 23 ++++++
 NEWS                                               | 12 ++++
 PKG-INFO                                           |  4 +-
 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  6 +-
 debian/patches/pbr.patch                           | 24 -------
 .../return-to-a-standard-requirements-def.patch    | 26 -------
 debian/patches/series                              |  2 -
 docs/conf.py                                       |  6 +-
 docs/index.txt                                     | 16 +++--
 mock.egg-info/PKG-INFO                             |  4 +-
 mock.egg-info/pbr.json                             |  2 +-
 mock.egg-info/requires.txt                         |  4 +-
 mock/mock.py                                       | 82 +++++++++++++---------
 mock/tests/support.py                              |  1 -
 mock/tests/testhelpers.py                          | 24 +++++--
 mock/tests/testmagicmethods.py                     | 22 +++---
 mock/tests/testmock.py                             | 39 ++++++++--
 mock/tests/testpatch.py                            | 32 ++++++++-
 mock/tests/testwith.py                             | 28 ++++++++
 requirements.txt                                   |  4 +-
 setup.py                                           | 14 +---
 tools/pre-applypatch                               |  1 -
 25 files changed, 236 insertions(+), 151 deletions(-)

diff --cc debian/.git-dpm
index 34d7c70,0000000..4ff0cd6
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
- 3d5ec0cb023b574ca82ced46f8b001964108bba3
- 3d5ec0cb023b574ca82ced46f8b001964108bba3
- 8781dfb863383bc38c8e8291dd2cd395c25e21da
++6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
++6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
++6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
 +6811a9d12ae8b5e8ba7ee0f6bca5b9b8d95530dc
 +python-mock_2.0.0.orig.tar.gz
 +397ed52eb2d8d4b326bc3fa6b38adda5f0b090d3
 +73684
 +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/python-mock.git