[Python-modules-commits] [python-testfixtures] 05/07: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-testfixtures.

commit 2c5d7f8f97b54f7f1c746ebb22caf923bf5820b3
Merge: 72190d2 65ca0a0
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 16 11:54:16 2017 +0100

    merge patched into master

 .coveragerc                                                    |  1 -
 debian/.git-dpm                                                |  6 +++---
 debian/patches/0001-Use-local-objects.inv-where-possible.patch |  2 +-
 .../0002-Do-not-duplicate-license-in-documentation.patch       |  2 +-
 docs/changes.txt                                               | 10 ++++++++--
 testfixtures/comparison.py                                     |  7 ++++---
 testfixtures/shouldraise.py                                    |  1 -
 testfixtures/tests/test_compare.py                             |  6 ++++++
 testfixtures/tests/test_should_raise.py                        |  2 --
 testfixtures/version.txt                                       |  2 +-
 10 files changed, 24 insertions(+), 15 deletions(-)

diff --cc debian/.git-dpm
index de51496,0000000..2fefb51
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 34282a757369b2075489e345a3e2b6ef1d9bf81a
- 34282a757369b2075489e345a3e2b6ef1d9bf81a
- b3abbb47901caf30202a2f0c6607aa9cf7e98c94
++65ca0a0d1390a74289df878ae346c57dede7306f
++65ca0a0d1390a74289df878ae346c57dede7306f
++d53380c5c4fb5eee56cf76a2a3df379c8a842556
 +d53380c5c4fb5eee56cf76a2a3df379c8a842556
 +python-testfixtures_4.13.5.orig.tar.gz
 +86258d21619f744be65b120d90a408bb0afdd0f2
 +93704
diff --cc debian/patches/0001-Use-local-objects.inv-where-possible.patch
index cf19f41,0000000..c05390e
mode 100644,000000..100644
--- a/debian/patches/0001-Use-local-objects.inv-where-possible.patch
+++ b/debian/patches/0001-Use-local-objects.inv-where-possible.patch
@@@ -1,35 -1,0 +1,35 @@@
- From af210a630e6be7a63508b06b6f0c28826f408325 Mon Sep 17 00:00:00 2001
++From 7791a3aaf7ff638f4af4b5a5f6757f532e526105 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Fri, 27 Jan 2017 09:50:38 +0100
 +Subject: Use local objects.inv where possible
 +
 +Upstream uses intersphinx mappings that fetch the objects.inv for python by
 +HTTP from a remote host. Using the local objects.inv from python enables the
 +package to build without network connection.
 +---
 + docs/conf.py | 12 +++++++++++-
 + 1 file changed, 11 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 3a340fd..6cc40b0 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -14,7 +14,17 @@ extensions = [
 +     'sphinx.ext.intersphinx'
 +     ]
 + 
 +-intersphinx_mapping = {'http://docs.python.org': None}
 ++def check_object_path(key, url, path):
 ++    if os.path.isfile(path):
 ++        return {key: (url, path)}
 ++    return {}
 ++
 ++intersphinx_mapping = {}
 ++intersphinx_mapping.update(check_object_path('python',
 ++                                            'https://docs.python.org/',
 ++                                            '/usr/share/doc/python'
 ++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
 ++                                              + '/html/objects.inv'))
 + 
 + # General
 + source_suffix = '.txt'
diff --cc debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
index 09a3d2d,0000000..465b4c2
mode 100644,000000..100644
--- a/debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
+++ b/debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 34282a757369b2075489e345a3e2b6ef1d9bf81a Mon Sep 17 00:00:00 2001
++From 65ca0a0d1390a74289df878ae346c57dede7306f Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Fri, 27 Jan 2017 09:54:15 +0100
 +Subject: Do not duplicate license in documentation.
 +
 +---
 + docs/index.txt   | 1 -
 + docs/license.txt | 5 -----
 + 2 files changed, 6 deletions(-)
 + delete mode 100644 docs/license.txt
 +
 +diff --git a/docs/index.txt b/docs/index.txt
 +index cbd65e0..c0b8433 100644
 +--- a/docs/index.txt
 ++++ b/docs/index.txt
 +@@ -38,7 +38,6 @@ development, please see the sections below:
 +    installation.txt
 +    development.txt
 +    changes.txt
 +-   license.txt
 + 
 + Indices and tables
 + ==================
 +diff --git a/docs/license.txt b/docs/license.txt
 +deleted file mode 100644
 +index b383c6e..0000000
 +--- a/docs/license.txt
 ++++ /dev/null
 +@@ -1,5 +0,0 @@
 +-=======
 +-License
 +-=======
 +-
 +-.. literalinclude:: ../LICENSE.txt

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