[Python-modules-commits] [django-classy-tags] 04/06: 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 7b66fa0a6e2481388571cffbc56f1913f3b6b6fb
Merge: 0eee1dc ffe9f41
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Jan 29 12:33:11 2016 +0100

    merge patched into master

 .travis.yml                           |   2 +-
 classytags/__init__.py                |   2 +-
 classytags/arguments.py               |  15 +++--
 classytags/compat.py                  |   1 +
 classytags/core.py                    |  16 ++++--
 classytags/exceptions.py              |   5 +-
 classytags/helpers.py                 |  10 +++-
 classytags/parser.py                  |  11 ++--
 classytags/test/project/testrunner.py |  27 ---------
 classytags/test/run_tests.py          | 105 ----------------------------------
 classytags/tests.py                   |  66 ++++++++++++++++-----
 classytags/utils.py                   |  14 +++--
 classytags/values.py                  |  16 ++++--
 debian/.git-dpm                       |   6 +-
 debian/patches/intersphinx.patch      |   2 +-
 docs/changes.rst                      |   8 +++
 setup.cfg                             |   2 +
 setup.py                              |   2 +-
 18 files changed, 131 insertions(+), 179 deletions(-)

diff --cc debian/.git-dpm
index 2be861e,0000000..954825e
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
- f753bec2281dfd05cb7be9c300b57ce1917cd449
- f753bec2281dfd05cb7be9c300b57ce1917cd449
- 3a6ff905c7958f804d9925b02a04b3eb40cd93a6
++ffe9f417414e95095444f3061ac51caf19fd6df7
++ffe9f417414e95095444f3061ac51caf19fd6df7
++f29f75bfba4f22635a67acbea2e5ebe669c26e19
 +f29f75bfba4f22635a67acbea2e5ebe669c26e19
 +django-classy-tags_0.7.1.orig.tar.gz
 +10ef8d14d70cfce9d0f05f15659d3112f4fdda78
 +35758
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index ec645b8,0000000..6636c27
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,29 -1,0 +1,29 @@@
- From f753bec2281dfd05cb7be9c300b57ce1917cd449 Mon Sep 17 00:00:00 2001
++From ffe9f417414e95095444f3061ac51caf19fd6df7 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