[Python-modules-commits] [python-testfixtures] 05/08: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu Jun 1 14:07:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-testfixtures.
commit 2052c70b6ad057e82246f288fedb17c3947c1aed
Merge: 06c52de 00b994c
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue May 30 14:10:42 2017 +0200
merge patched into master
.travis.yml | 8 +-
debian/.git-dpm | 6 +-
...0001-Use-local-objects.inv-where-possible.patch | 44 +++--
...Do-not-duplicate-license-in-documentation.patch | 6 +-
docs/api.txt | 8 +
docs/changes.txt | 29 ++-
docs/comparing.txt | 2 +
docs/components.txt | 6 +-
docs/conf.py | 24 ++-
docs/description.txt | 18 +-
docs/django.txt | 54 ++++++
docs/index.txt | 1 +
docs/mocking.txt | 4 +-
setup.py | 8 +-
testfixtures/comparison.py | 5 +-
testfixtures/django.py | 24 +++
testfixtures/shouldraise.py | 3 +
testfixtures/tests/compat.py | 9 +-
testfixtures/tests/test_compare.py | 202 +++++++++++----------
testfixtures/tests/test_components.py | 11 +-
testfixtures/tests/test_django/__init__.py | 0
testfixtures/tests/test_django/models.py | 11 ++
testfixtures/tests/test_django/settings.py | 4 +
testfixtures/tests/test_django/tests.py | 75 ++++++++
testfixtures/tests/test_should_raise.py | 6 +-
testfixtures/tests/test_shouldwarn.py | 27 ++-
testfixtures/version.txt | 2 +-
27 files changed, 427 insertions(+), 170 deletions(-)
diff --cc debian/.git-dpm
index 3bace26,0000000..68ee61a
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
- 65ca0a0d1390a74289df878ae346c57dede7306f
- 65ca0a0d1390a74289df878ae346c57dede7306f
- d53380c5c4fb5eee56cf76a2a3df379c8a842556
++00b994c3b19db069cd879047d26aa21a40630ef8
++00b994c3b19db069cd879047d26aa21a40630ef8
++50ec3f8173a0bab6e2d6da3cd8a5739105a3641a
+50ec3f8173a0bab6e2d6da3cd8a5739105a3641a
+python-testfixtures_4.14.3.orig.tar.gz
+ebb730037671b78216bade71ce2b22b87e6ee442
+95591
diff --cc debian/patches/0001-Use-local-objects.inv-where-possible.patch
index c05390e,0000000..7e89b60
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,57 @@@
- From 7791a3aaf7ff638f4af4b5a5f6757f532e526105 Mon Sep 17 00:00:00 2001
++From d51fe5544dab8a41907e32f3f73a4a0dc3951c04 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(-)
++ docs/conf.py | 27 +++++++++++++++++++++++----
++ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 3a340fd..6cc40b0 100644
++index 7a3cef7..7b44b46 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -14,7 +14,17 @@ extensions = [
++@@ -4,6 +4,7 @@ import os
++ import pkginfo
++ import sys
++ import time
+++import django
++
++ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
++ pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__), '..'))
++@@ -14,10 +15,28 @@ extensions = [
+ 'sphinx.ext.intersphinx'
+ ]
+
- -intersphinx_mapping = {'http://docs.python.org': None}
++-intersphinx_mapping = {
++- 'http://docs.python.org': None,
++- 'http://django.readthedocs.org/en/latest/': 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'))
+++intersphinx_mapping.update(check_object_path(
+++ 'python',
+++ 'https://docs.python.org/{v}/'.format(
+++ v='.'.join(map(str, sys.version_info[0:2]))
+++ ),
+++ '/usr/share/doc/python{v}/html/objects.inv'.format(
+++ v='.'.join(map(str, sys.version_info[0:2]))
+++ )
+++))
+++intersphinx_mapping.update(check_object_path(
+++ 'django',
+++ 'https://docs.djangoproject.com/en/{v}/'.format(
+++ v='.'.join(map(str, django.VERSION[:2]))
+++ ),
+++ '/usr/share/doc/python-django-doc/html/objects.inv'
+++))
+
+ # General
+ source_suffix = '.txt'
diff --cc debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
index 465b4c2,0000000..470c721
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 65ca0a0d1390a74289df878ae346c57dede7306f Mon Sep 17 00:00:00 2001
++From 00b994c3b19db069cd879047d26aa21a40630ef8 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
++index af85e1d..8b51a75 100644
+--- a/docs/index.txt
++++ b/docs/index.txt
- @@ -38,7 +38,6 @@ development, please see the sections below:
++@@ -39,7 +39,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
More information about the Python-modules-commits
mailing list