[Python-modules-commits] [python-django-braces] 06/10: 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-django-braces.

commit d96af5d7b931bd9dd64773aaa8f8d16af2986b85
Merge: 8b5f09e 004059e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Jun 17 13:33:27 2016 +0200

    merge patched into master

 .gitignore                          |   1 +
 .travis.yml                         |  28 ++++++----
 CONTRIBUTORS.txt                    |   3 ++
 README.md                           |  12 ++---
 braces/__init__.py                  |   2 +-
 braces/views/_access.py             |  36 +++++++------
 braces/views/_ajax.py               |  19 +++----
 braces/views/_forms.py              |   5 +-
 debian/.git-dpm                     |   6 +--
 debian/patches/alabaster-path.patch |   6 +--
 docs/access.rst                     |   8 +--
 docs/changelog.rst                  |  27 ++++++++--
 docs/conf.py                        |   4 +-
 docs/contributing.rst               |   2 +
 docs/form.rst                       |   4 +-
 docs/other.rst                      |  78 +++++++++++++++++++++++++--
 requirements.txt                    |   1 -
 setup.py                            |  13 +++--
 tests/test_access_mixins.py         | 103 +++++++++++++++++++++++++++++++-----
 tests/test_ajax_mixins.py           |  79 ++++++++++++++-------------
 tests/test_other_mixins.py          |  10 ++--
 tests/views.py                      |   7 +++
 tox.ini                             |  12 +++--
 23 files changed, 332 insertions(+), 134 deletions(-)

diff --cc debian/.git-dpm
index 6b42374,0000000..feadd89
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
- f9252aad29a4c3afa5c0e95804856ebfba1e8984
- f9252aad29a4c3afa5c0e95804856ebfba1e8984
- de5063b93f71e5d01f8fc5e9a91c1844abee21ae
++004059e416cad7a29ce0b581fa9a7861301b5e1c
++004059e416cad7a29ce0b581fa9a7861301b5e1c
++2057b82f2eb7b34b1ad6644e6fabb52f82395b30
 +2057b82f2eb7b34b1ad6644e6fabb52f82395b30
 +python-django-braces_1.9.0.orig.tar.gz
 +0ba8d00c6622bfa6219a47c46c8428e5c1c92383
 +44049
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/alabaster-path.patch
index f4d9c58,0000000..0c2f9e3
mode 100644,000000..100644
--- a/debian/patches/alabaster-path.patch
+++ b/debian/patches/alabaster-path.patch
@@@ -1,43 -1,0 +1,43 @@@
- From f9252aad29a4c3afa5c0e95804856ebfba1e8984 Mon Sep 17 00:00:00 2001
++From 004059e416cad7a29ce0b581fa9a7861301b5e1c Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 11:46:10 -0700
 +Subject: Set path and extension for alabaster theme
 +
 +Last-Update: 2015-05-05
 +Forwarded: no
 +
 +Patch-Name: alabaster-path.patch
 +---
 + docs/conf.py | 5 +++--
 + 1 file changed, 3 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index d2e6ab9..495a3da 100644
++index 3b0e84d..917fc72 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -15,6 +15,7 @@ import sys, os
 + 
 + sys.path.insert(0, os.path.abspath('..'))
 + import braces
 ++import alabaster
 + from braces import __version__
 + 
 + # If extensions (or modules to document with autodoc) are in another directory,
 +@@ -29,7 +30,7 @@ from braces import __version__
 + 
 + # Add any Sphinx extension module names here, as strings. They can be extensions
 + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 +-extensions = ['releases']
 ++extensions = ['releases', 'alabaster']
 + 
 + releases_issue_uri = "https://github.com/brack3t/django-braces/issues/%s"
 + releases_release_uri = "https://github.com/brack3t/django-braces/tree/%s"
- @@ -106,7 +107,7 @@ html_theme = 'alabaster'
++@@ -108,7 +109,7 @@ html_theme = 'default'
 + #html_theme_options = {}
 + 
 + # Add any paths that contain custom themes here, relative to this directory.
 +-#html_theme_path = []
 ++html_theme_path = [alabaster.get_path()]
 + 
 + # The name for this set of Sphinx documents.  If None, it defaults to
 + # "<project> v<release> documentation".

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