[Python-modules-commits] [vcr.py] 05/05: merge patched into master

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository vcr.py.

commit e24bc5eab2024b361fc4a2c8b6c0b790fbeb295f
Merge: e7b6107 73f9951
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Mon Sep 11 01:24:10 2017 +0200

    merge patched into master

 .gitignore                                         |  1 +
 .travis.yml                                        | 25 +++++---
 debian/.git-dpm                                    |  6 +-
 debian/patches/remove-privacy-breach-urls.patch    |  2 +-
 docs/advanced.rst                                  | 27 ++++++++-
 docs/changelog.rst                                 | 13 ++++
 runtests.sh                                        |  2 +-
 setup.py                                           |  9 ++-
 tests/integration/aiohttp_utils.py                 | 12 +++-
 tests/integration/async_def.py                     | 13 ++++
 tests/integration/test_aiohttp.py                  | 70 +++++++++++++++++-----
 tests/integration/test_http                        | 22 +++++++
 tests/integration/test_register_persister.py       | 40 +++++++++++++
 tests/integration/test_requests.py                 | 33 +++++++++-
 tests/unit/test_cassettes.py                       |  3 +-
 tests/unit/test_persist.py                         |  6 +-
 tests/unit/test_serialize.py                       |  8 ++-
 tests/unit/test_stubs.py                           |  9 +++
 tests/unit/test_vcr.py                             |  6 +-
 tox.ini                                            | 19 +++---
 vcr/_handle_coroutine.py                           |  7 +++
 vcr/cassette.py                                    | 61 +++++++++++--------
 vcr/config.py                                      |  6 ++
 vcr/matchers.py                                    |  3 +-
 vcr/migration.py                                   |  1 +
 vcr/patch.py                                       | 33 +++++-----
 vcr/persist.py                                     | 14 -----
 vcr/persisters/filesystem.py                       | 17 +++++-
 vcr/serializers/compat.py                          |  2 +-
 vcr/stubs/__init__.py                              | 23 ++++++-
 .../__init__.py}                                   | 13 ++--
 vcr/stubs/requests_stubs.py                        |  4 +-
 32 files changed, 390 insertions(+), 120 deletions(-)

diff --cc debian/.git-dpm
index 5859f0d,0000000..d9debb8
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
- 55f496d8182bc109cfa991d37adf06fe794ae144
- 55f496d8182bc109cfa991d37adf06fe794ae144
- 4dac0b8a3dd26a14acb4f8a1b4c846e4bc93535f
++73f9951801ea62ca46764d694849626ec83c1a9e
++73f9951801ea62ca46764d694849626ec83c1a9e
++141da83d0d6f46411ffa581c900c441ceb0ca0cd
 +141da83d0d6f46411ffa581c900c441ceb0ca0cd
 +vcr.py_1.11.1.orig.tar.gz
 +9aa9490eedce87596c8015f545ffb5020459eaee
 +326239
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-privacy-breach-urls.patch
index df8d9c8,0000000..1543391
mode 100644,000000..100644
--- a/debian/patches/remove-privacy-breach-urls.patch
+++ b/debian/patches/remove-privacy-breach-urls.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 55f496d8182bc109cfa991d37adf06fe794ae144 Mon Sep 17 00:00:00 2001
++From 73f9951801ea62ca46764d694849626ec83c1a9e Mon Sep 17 00:00:00 2001
 +From: Daniele Tricoli <eriol at mornie.org>
 +Date: Sun, 28 Aug 2016 18:50:51 +0200
 +Subject: Remove privacy breach URLs
 +
 +Forwarded: not-needed
 +Patch-Name: remove-privacy-breach-urls.patch
 +---
 + README.rst | 5 -----
 + 1 file changed, 5 deletions(-)
 +
 +diff --git a/README.rst b/README.rst
 +index 85854f5..8df1fe4 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -1,11 +1,6 @@
 +-|PyPI| |Build Status| |Waffle Ready| |Gitter|
 +-
 + VCR.py
 + ======
 + 
 +-.. image:: https://raw.github.com/kevin1024/vcrpy/master/vcr.png
 +-   :alt: vcr.py
 +-
 + This is a Python version of `Ruby's VCR
 + library <https://github.com/vcr/vcr>`__.
 + 

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