[Python-modules-commits] [django-tables] 02/06: Merge tag 'upstream/1.10.0' 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-tables.

commit 7abbaebfd529949ef008e7abe943a9fb922eb925
Merge: 9d459f7 745aaed
Author: Brian May <bam at debian.org>
Date:   Wed Aug 9 17:06:55 2017 +1000

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

 .coveragerc                                |  1 +
 CHANGELOG.md                               | 10 +++-
 django_tables2/__init__.py                 |  8 +--
 django_tables2/columns/__init__.py         |  3 +-
 django_tables2/columns/base.py             | 25 ++++++---
 django_tables2/columns/manytomanycolumn.py | 73 +++++++++++++++++++++++++
 django_tables2/export/TODO.md              | 10 ----
 django_tables2/export/export.py            |  5 +-
 django_tables2/export/views.py             | 19 ++++++-
 django_tables2/rows.py                     |  2 +-
 django_tables2/tables.py                   | 48 ++++++++++++++--
 docs/index.rst                             |  1 -
 docs/pages/api-reference.rst               |  9 ++-
 docs/pages/builtin-columns.rst             |  1 +
 docs/pages/custom-data.rst                 | 11 +++-
 docs/pages/export.rst                      | 26 +++++++++
 docs/pages/performance.rst                 | 12 ----
 docs/pages/table-data.rst                  | 13 +++++
 requirements/common.pip                    |  2 +-
 tests/app/models.py                        |  2 +
 tests/columns/test_manytomanycolumn.py     | 80 +++++++++++++++++++++++++++
 tests/export/test_export.py                | 88 +++++++++++++++++++++++++-----
 tests/test_core.py                         | 68 ++++++++++++++++++++---
 tox.ini                                    | 21 ++++---
 24 files changed, 458 insertions(+), 80 deletions(-)

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