[Python-modules-commits] [betamax] 05/08: 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 betamax.

commit c5618fe4b9f181486417525f6dd9a725f13871ed
Merge: 9c241c3 b643a8e
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Sun Sep 11 15:59:09 2016 +0200

    merge patched into master

 HISTORY.rst                                        |  22 +++++
 PKG-INFO                                           |  24 ++++-
 betamax/__init__.py                                |   2 +-
 betamax/exceptions.py                              |  48 ++++++++++
 betamax/fixtures/pytest.py                         | 105 ++++++++++++++++++---
 betamax/matchers/body.py                           |  19 ++--
 betamax/matchers/query.py                          |   5 +-
 betamax/options.py                                 |  13 ++-
 debian/.git-dpm                                    |   6 +-
 debian/patches/local-intersphinx.patch             |   2 +-
 docs/api.rst                                       |   5 +-
 setup.cfg                                          |   4 +-
 tests/cassettes/FakeBetamaxTestCase.test_fake.json |   1 +
 ...est_pytest_fixture[https:-httpbin.org-get].json |   1 +
 tests/integration/test_fixtures.py                 |  25 +++++
 .../regression/test_requests_2_11_body_matcher.py  |  27 ++++++
 tests/unit/test_cassette.py                        |   8 ++
 tests/unit/test_exceptions.py                      |  35 +++++++
 tests/unit/test_matchers.py                        |   3 +
 tests/unit/test_options.py                         |  55 ++++++++---
 20 files changed, 363 insertions(+), 47 deletions(-)

diff --cc debian/.git-dpm
index cc14ae5,0000000..6f92e80
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
- a5e2a0734253678e84b183762a0713e7f386e828
- a5e2a0734253678e84b183762a0713e7f386e828
- 36b432a680726f52fa78fcc2b7045aa30779cdac
++b643a8e33f08864318ffab64c96fd12922b20cef
++b643a8e33f08864318ffab64c96fd12922b20cef
++9414c3ae38c7c86e7342496e0a8bf5f1aae37a01
 +9414c3ae38c7c86e7342496e0a8bf5f1aae37a01
 +betamax_0.8.0.orig.tar.gz
 +f01bfe5d550fa1e222b234502deb1f87c695b989
 +78398
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/local-intersphinx.patch
index 0c9441e,0000000..ceda8ff
mode 100644,000000..100644
--- a/debian/patches/local-intersphinx.patch
+++ b/debian/patches/local-intersphinx.patch
@@@ -1,27 -1,0 +1,27 @@@
- From a5e2a0734253678e84b183762a0713e7f386e828 Mon Sep 17 00:00:00 2001
++From b643a8e33f08864318ffab64c96fd12922b20cef Mon Sep 17 00:00:00 2001
 +From: Daniele Tricoli <eriol at mornie.org>
 +Date: Wed, 13 Jul 2016 17:51:57 +0200
 +Subject: Use local python3-doc for intersphinx
 +
 +Patch-Name: local-intersphinx.patch
 +---
 + docs/conf.py | 8 ++++----
 + 1 file changed, 4 insertions(+), 4 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index b8a8d06..f28dabd 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -242,8 +242,8 @@ texinfo_appendices = []
 + 
 + # Intersphinx configuration
 + intersphinx_mapping = {
 +-    'python': ('https://docs.python.org/3.4',
 +-               (None, 'python-inv.txt')),
 +-    'requests': ('http://docs.python-requests.org/en/latest',
 +-                 (None, 'requests-inv.txt')),
 ++    'python': ('/usr/share/doc/python3-doc/html', None),
 ++    # requests doesn't ship docs in sdist.
 ++    # 'requests': ('http://docs.python-requests.org/en/latest',
 ++    #              (None, 'requests-inv.txt')),
 + }

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