[Python-modules-commits] [django-guardian] 02/02: Merge tag 'upstream/1.4.8' into debian/master

[Brian May]

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

bam pushed a commit to branch debian/master
in repository django-guardian.

commit f68643b9237f654fdb509db3c44920024eeab9ef
Merge: d69d377 0033bf7
Author: Brian May <bam at debian.org>
Date:   Sun Jun 25 13:11:21 2017 +1000

    Merge tag 'upstream/1.4.8' into debian/master
    
    Upstream version 1.4.8

 .gitignore                                         |   1 +
 .isort.cfg                                         |   4 +
 .travis.yml                                        |  60 +++-----
 AUTHORS                                            |   1 +
 CHANGES                                            |  48 +++++++
 LICENSE                                            |   2 +-
 MANIFEST.in                                        |  10 +-
 PKG-INFO                                           | 118 +++++++++++++++-
 README.rst                                         |  73 ++++++----
 benchmarks/models.py                               |   4 +-
 django_guardian.egg-info/PKG-INFO                  | 118 +++++++++++++++-
 django_guardian.egg-info/SOURCES.txt               |  28 ++--
 django_guardian.egg-info/requires.txt              |   1 -
 docs/api/guardian.mixins.rst                       |   5 +
 docs/conf.py                                       |   7 +-
 docs/configuration.rst                             |  18 +++
 docs/overview.rst                                  |   4 +-
 docs/userguide/admin-integration.rst               |   1 -
 docs/userguide/assign.rst                          |   7 +-
 docs/userguide/custom-user-model.rst               |   2 +-
 docs/userguide/performance.rst                     |   6 +-
 example_project/articles/__init__.py               |   0
 example_project/articles/admin.py                  |  10 ++
 example_project/articles/apps.py                   |   7 +
 .../articles/migrations/0001_initial.py            |  66 +++++++++
 .../articles/migrations/0002_auto_20160622_1050.py |  19 +++
 example_project/articles/migrations/__init__.py    |   0
 example_project/articles/models.py                 |  34 +++++
 .../templates/articles/article_confirm_delete.html |  13 ++
 .../templates/articles/article_detail.html         |  28 ++++
 .../articles/templates/articles/article_form.html  |  18 +++
 .../articles/templates/articles/article_list.html  |  25 ++++
 example_project/articles/tests.py                  |  98 +++++++++++++
 example_project/articles/urls.py                   |  18 +++
 example_project/articles/views.py                  |  42 ++++++
 example_project/{ => core}/context_processors.py   |   0
 example_project/core/migrations/0001_initial.py    |  15 +-
 example_project/manage.py                          |   2 +-
 example_project/settings.py                        |  17 ++-
 example_project/templates/base.html                |   3 +-
 example_project/urls.py                            |   2 +-
 guardian/__init__.py                               |  19 +--
 guardian/admin.py                                  |  71 ++++++----
 guardian/apps.py                                   |   3 +-
 guardian/backends.py                               |  19 ++-
 guardian/checks.py                                 |   3 +-
 guardian/compat.py                                 |  56 ++++++--
 guardian/conf/settings.py                          |   5 +
 guardian/core.py                                   |  43 +++---
 guardian/ctypes.py                                 |  16 +++
 guardian/decorators.py                             |  31 ++++-
 guardian/forms.py                                  |   8 +-
 guardian/managers.py                               | 152 ++++++++++++---------
 guardian/migrations/0001_initial.py                |  12 +-
 guardian/mixins.py                                 |  98 +++++++++++--
 guardian/models.py                                 |  29 ++--
 guardian/shortcuts.py                              | 140 +++++++++++--------
 .../admin/guardian/contrib/grappelli/field.html    |   7 -
 .../contrib/grappelli/obj_perms_manage.html        |  30 ++--
 .../contrib/grappelli/obj_perms_manage_group.html  |  29 +++-
 .../contrib/grappelli/obj_perms_manage_user.html   |  29 +++-
 guardian/templatetags/guardian_tags.py             |   5 +-
 guardian/testapp/migrations/0001_initial.py        | 117 +++++++++++-----
 .../testapp/migrations/0002_logentrywithgroup.py   |  13 +-
 .../testapp/migrations/0003_auto_20141124_0729.py  |  30 ----
 .../testapp/migrations/0004_auto_20151112_2209.py  |  36 -----
 .../testapp/migrations/0005_auto_20151217_2344.py  |  22 ---
 .../testapp/migrations/0006_auto_20160221_1054.py  |  30 ----
 .../testapp/migrations/0007_auto_20160309_0245.py  |  46 -------
 guardian/testapp/models.py                         |  25 ++--
 guardian/testapp/tests/templates/dummy404.html     |   1 +
 guardian/testapp/tests/templates/list.html         |   5 +
 guardian/testapp/tests/test_admin.py               |  16 ++-
 guardian/testapp/tests/test_conf.py                |  10 ++
 guardian/testapp/tests/test_core.py                | 105 +++++++++-----
 guardian/testapp/tests/test_custompkmodel.py       |   2 +-
 guardian/testapp/tests/test_decorators.py          |  51 ++++++-
 guardian/testapp/tests/test_direct_rel.py          |  72 ++++++----
 guardian/testapp/tests/test_managers.py            |  21 ++-
 guardian/testapp/tests/test_mixins.py              |  56 +++++++-
 guardian/testapp/tests/test_shortcuts.py           |  51 ++++++-
 guardian/testapp/tests/urls.py                     |   2 +-
 guardian/testapp/testsettings.py                   |  19 ++-
 guardian/utils.py                                  |  44 +++---
 guardian/version.py                                |   4 -
 requirements.txt                                   |   4 +-
 setup.cfg                                          |  13 +-
 setup.py                                           |  18 +--
 tox.ini                                            |  58 ++++----
 89 files changed, 1860 insertions(+), 751 deletions(-)

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