[Python-modules-commits] [django-tables] 04/08: merge patched into master
Brian May
bam at moszumanska.debian.org
Wed Apr 6 03:14:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-tables.
commit fa420909521dde36209a74daea4a2b99a13862cb
Merge: 249bdb7 b53c79c
Author: Brian May <bam at debian.org>
Date: Wed Apr 6 12:53:23 2016 +1000
merge patched into master
.travis.yml | 12 +-
CHANGELOG.md | 29 +++
README.md | 68 -----
README.rst | 106 ++++++++
debian/.git-dpm | 6 +-
debian/patches/local_inventory | 6 +-
django_tables2/__init__.py | 10 +-
django_tables2/columns/__init__.py | 2 +-
django_tables2/columns/base.py | 100 ++-----
django_tables2/columns/booleancolumn.py | 40 ++-
django_tables2/columns/checkboxcolumn.py | 55 ++--
django_tables2/columns/datecolumn.py | 4 +-
django_tables2/columns/datetimecolumn.py | 9 +-
django_tables2/columns/emailcolumn.py | 4 +-
django_tables2/columns/filecolumn.py | 27 +-
django_tables2/columns/linkcolumn.py | 80 +++---
django_tables2/columns/templatecolumn.py | 22 +-
django_tables2/rows.py | 14 +-
django_tables2/static/django_tables2/bootstrap.css | 8 +
django_tables2/tables.py | 85 +++---
.../templates/django_tables2/bootstrap.html | 74 ++++++
django_tables2/templates/django_tables2/table.html | 39 ++-
django_tables2/templatetags/django_tables2.py | 112 ++------
django_tables2/utils.py | 128 ++-------
django_tables2/views.py | 16 +-
docs/conf.py | 4 +-
docs/pages/builtin-columns.rst | 2 +-
docs/pages/generic-mixins.rst | 3 +-
docs/pages/localization-control.rst | 4 +-
docs/pages/tutorial.rst | 15 +-
example/app/migrations/0002_person_country.py | 21 ++
example/app/models.py | 6 +
example/app/tables.py | 12 +-
example/app/views.py | 27 +-
example/settings.py | 57 ++--
example/templates/bootstrap_template.html | 22 ++
example/templates/class_based.html | 8 +-
example/urls.py | 4 +-
requirements/common.pip | 3 +-
setup.py | 31 ++-
tests/app/models.py | 41 ++-
tests/app/settings.py | 44 ++--
tests/columns/test_booleancolumn.py | 51 +++-
tests/columns/test_checkboxcolumn.py | 72 ++++--
tests/columns/test_datecolumn.py | 4 +-
tests/columns/test_datetimecolumn.py | 6 +-
tests/columns/test_emailcolumn.py | 1 +
tests/columns/test_filecolumn.py | 59 +++--
tests/columns/test_general.py | 91 ++++---
tests/columns/test_linkcolumn.py | 73 +++---
tests/columns/test_templatecolumn.py | 16 +-
tests/columns/test_timecolumn.py | 39 +++
tests/columns/test_urlcolumn.py | 1 +
tests/test_config.py | 22 +-
tests/test_core.py | 40 +--
tests/test_models.py | 54 +++-
tests/test_rows.py | 5 +
tests/test_templates.py | 286 +++++----------------
tests/test_templatetags.py | 170 ++++++++++++
tests/test_utils.py | 62 +++--
tests/test_views.py | 80 ++++--
tests/utils.py | 60 ++---
tox.ini | 14 +-
63 files changed, 1433 insertions(+), 1133 deletions(-)
diff --cc debian/.git-dpm
index 84d2bb4,0000000..8b9f5ec
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
- 55b4f4fbc0e3c7922ae51188fc2358e1d0442aab
- 55b4f4fbc0e3c7922ae51188fc2358e1d0442aab
- 04b8a90dfa49efcf9a9f6acb2fbbf61b5edd7d7f
++b53c79c78ff7e1344e79cf55c3af7a567fdb8081
++b53c79c78ff7e1344e79cf55c3af7a567fdb8081
++5119d5474f79dc86c40d7d395e374fc939b68332
+5119d5474f79dc86c40d7d395e374fc939b68332
+django-tables_1.1.6.orig.tar.gz
+4f6a3fa14b4cc9a3321fbf90171606d1bf22dac0
+113389
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/local_inventory
index 6e77b41,0000000..906ec07
mode 100644,000000..100644
--- a/debian/patches/local_inventory
+++ b/debian/patches/local_inventory
@@@ -1,27 -1,0 +1,27 @@@
- From 55b4f4fbc0e3c7922ae51188fc2358e1d0442aab Mon Sep 17 00:00:00 2001
++From b53c79c78ff7e1344e79cf55c3af7a567fdb8081 Mon Sep 17 00:00:00 2001
+From: Brian May <bam at debian.org>
+Date: Thu, 8 Oct 2015 08:57:46 -0700
+Subject: Use local copies of object.inv for building documentation.
+
+Last-Update: 2013-06-20
+
+Patch-Name: local_inventory
+---
+ docs/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 18ccc6f..69083bb 100644
++index 42836f5..2082598 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -30,8 +30,8 @@ extensions = [
++@@ -28,8 +28,8 @@ extensions = [
+ ]
+
+ intersphinx_mapping = {
+- 'python': ('http://docs.python.org/dev/', None),
+- 'django': ('http://docs.djangoproject.com/en/dev/', 'http://docs.djangoproject.com/en/dev/_objects/'),
++ 'python': ('/usr/share/doc/python2.7-doc/html', None),
++ 'django': ('/usr/share/doc/python-django-doc/html', None),
+ }
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-tables.git
More information about the Python-modules-commits
mailing list