[Python-modules-commits] [django-classy-tags] 04/05: 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 django-classy-tags.

commit 67ebf8105f19566364acc5dd84e5ab5b8b88af53
Merge: a2d7b2f f753bec
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 19 21:20:02 2015 +0100

    merge patched into master

 .gitignore                          |  1 +
 .travis.yml                         | 43 ++++++++++++++++++++----------
 classytags/__init__.py              |  2 +-
 classytags/core.py                  | 32 +++++++++++++++++++++++
 classytags/test/context_managers.py | 14 +++++++---
 classytags/tests.py                 | 52 +++++++++++++++++++++++++++++++++++++
 debian/.git-dpm                     |  6 ++---
 debian/patches/intersphinx.patch    |  2 +-
 docs/changes.rst                    | 26 +++++++++++++++++++
 setup.cfg                           |  2 ++
 setup.py                            |  4 +--
 11 files changed, 161 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index 1c6bdbf,0000000..dea3e94
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
- 0cca86a86d70c285c65d869d1be6b51628fb5e6e
- 0cca86a86d70c285c65d869d1be6b51628fb5e6e
- af87829fe783a057c121be126bcbd5635a878003
++f753bec2281dfd05cb7be9c300b57ce1917cd449
++f753bec2281dfd05cb7be9c300b57ce1917cd449
++3a6ff905c7958f804d9925b02a04b3eb40cd93a6
 +3a6ff905c7958f804d9925b02a04b3eb40cd93a6
 +django-classy-tags_0.7.0.orig.tar.gz
 +d996ad218266ab2e62e58348cbeb1b96eeb59034
 +36783
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 7ff8023,0000000..ec645b8
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 0cca86a86d70c285c65d869d1be6b51628fb5e6e Mon Sep 17 00:00:00 2001
++From f753bec2281dfd05cb7be9c300b57ce1917cd449 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:50:54 -0700
 +Subject: Disable objects.inv download for sphinx.
 +
 + The python-django-doc package does not ship a objects.inv file by now, so there
 + is no sense in keeping intersphinx enabled. Once it is shipped, the patch
 + should switch to using the locally available Django objects.inv.
 +Last-Update: 2014-04-25
 +Forwarded: not-needed
 +
 +Patch-Name: intersphinx.patch
 +---
 + docs/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 37fcd78..4f5454b 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -24,7 +24,7 @@ import sys, os
 + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 + extensions = ["sphinx.ext.intersphinx"]
 + 
 +-intersphinx_mapping = {'django': ('http://readthedocs.org/projects/eric/django/docs/', None)}
 ++#intersphinx_mapping = {'django': ('http://readthedocs.org/projects/eric/django/docs/', None)}
 + 
 + # Add any paths that contain templates here, relative to this directory.
 + templates_path = ['_templates']

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