[Python-modules-commits] [django-memoize] 05/08: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository django-memoize.

commit 2dd083ec09e15d40c2f209160c6f95a21456875e
Merge: f095f2d aca53b8
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Wed Feb 22 19:59:38 2017 +0000

    merge patched into master

 CHANGES                                            |  6 ++
 PKG-INFO                                           |  3 +-
 debian/.git-dpm                                    |  6 +-
 ...default-alabaster-theme-for-documentation.patch |  2 +-
 debian/patches/0002-Make-the-tests-verbose.patch   |  2 +-
 memoize/__init__.py                                | 31 ++++++++--
 setup.py                                           |  3 +-
 tests/tests.py                                     | 66 +++++++++++++++++++++-
 8 files changed, 103 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index cbccf63,0000000..e1fd9d3
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
- d2d34b6081225b364ad1efa01e4f4d03a7642814
- d2d34b6081225b364ad1efa01e4f4d03a7642814
- 6d6143f330300189f970c1a8377fdbbe4c2987a1
++aca53b85a7b6051848ea6d9511d109ffd8b19008
++aca53b85a7b6051848ea6d9511d109ffd8b19008
++499c514e738c5aea73c60c436e87fa9d46412d18
 +499c514e738c5aea73c60c436e87fa9d46412d18
 +django-memoize_2.1.0+dfsg.orig.tar.gz
 +54a1245b765961f6f3f7063e99771146bce74942
 +19946
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-default-alabaster-theme-for-documentation.patch
index b9cbc66,0000000..c812a2e
mode 100644,000000..100644
--- a/debian/patches/0001-Use-default-alabaster-theme-for-documentation.patch
+++ b/debian/patches/0001-Use-default-alabaster-theme-for-documentation.patch
@@@ -1,37 -1,0 +1,37 @@@
- From f50ab1570d57fa64e34178afb5fda0f70f74bc86 Mon Sep 17 00:00:00 2001
++From 8f548902d45b18afa766bd93d3c203b0deda5e6f Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <christopher.hoskin at gmail.com>
 +Date: Mon, 25 Jul 2016 20:53:36 +0100
 +Subject: Use default 'alabaster' theme for documentation
 +
 +---
 + docs/conf.py | 11 +++++------
 + 1 file changed, 5 insertions(+), 6 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 57918f8..088c425 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -99,18 +99,17 @@ exclude_patterns = ['_build']
 + 
 + # The theme to use for HTML and HTML Help pages.  See the documentation for
 + # a list of builtin themes.
 +-html_theme = 'flask_small'
 ++#
 ++html_theme = 'alabaster'
 + 
 + # Theme options are theme-specific and customize the look and feel of a theme
 + # further.  For a list of options available for each theme, see the
 + # documentation.
 +-html_theme_options = {
 +-    'index_logo':       'flask-cache.png',
 +-    'github_fork':      'tvavrys/django-memoize'
 +-}
 ++#
 ++# html_theme_options = {}
 + 
 + # Add any paths that contain custom themes here, relative to this directory.
 +-html_theme_path = ['_themes']
 ++# html_theme_path = []
 + 
 + # The name for this set of Sphinx documents.  If None, it defaults to
 + # "<project> v<release> documentation".
diff --cc debian/patches/0002-Make-the-tests-verbose.patch
index b5623ee,0000000..5303788
mode 100644,000000..100644
--- a/debian/patches/0002-Make-the-tests-verbose.patch
+++ b/debian/patches/0002-Make-the-tests-verbose.patch
@@@ -1,21 -1,0 +1,21 @@@
- From d2d34b6081225b364ad1efa01e4f4d03a7642814 Mon Sep 17 00:00:00 2001
++From aca53b85a7b6051848ea6d9511d109ffd8b19008 Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <christopher.hoskin at gmail.com>
 +Date: Mon, 25 Jul 2016 21:00:36 +0100
 +Subject: Make the tests verbose
 +
 +---
 + runtests.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/runtests.py b/runtests.py
 +index 74dc29b..dc2c32e 100644
 +--- a/runtests.py
 ++++ b/runtests.py
 +@@ -13,6 +13,6 @@ if __name__ == "__main__":
 +         django.setup()
 +         
 +     TestRunner = get_runner(settings)
 +-    test_runner = TestRunner()
 ++    test_runner = TestRunner(verbosity=2)
 +     failures = test_runner.run_tests(["tests"])
 +     sys.exit(bool(failures))

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