[Python-modules-commits] [django-tables] 04/05: merge patched into master
Brian May
bam at moszumanska.debian.org
Wed Jan 6 09:50:29 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 b2eec8500521a43c4c9c234342c536fd218ae704
Merge: dc7e808 55b4f4f
Author: Brian May <bam at debian.org>
Date: Mon Jan 4 09:47:21 2016 +1100
merge patched into master
.gitignore | 1 +
.travis.yml | 50 ++--
README.md => CHANGELOG.md | 96 ++----
MANIFEST.in | 5 +-
README.md | 325 ++-------------------
debian/.git-dpm | 6 +-
debian/patches/dont_call_managers.patch | 24 --
debian/patches/local_inventory | 2 +-
debian/patches/series | 1 -
django_tables2/__init__.py | 8 +-
django_tables2/columns/base.py | 15 +-
django_tables2/columns/linkcolumn.py | 79 +++--
django_tables2/columns/timecolumn.py | 5 +-
django_tables2/rows.py | 7 +-
django_tables2/tables.py | 71 +++--
django_tables2/templates/django_tables2/table.html | 2 +
django_tables2/templatetags/django_tables2.py | 22 +-
django_tables2/utils.py | 50 +---
django_tables2/views.py | 4 +
docs/index.rst | 12 -
docs/pages/api-reference.rst | 13 +
example/README.rst | 7 +-
example/app/migrations/0001_initial.py | 41 +++
example/app/migrations/__init__.py | 0
example/manage.py | 3 +-
example/settings.py | 55 ++--
example/urls.py | 22 +-
requirements/common.pip | 2 +-
requirements/django-1.3.x.pip | 2 -
requirements/django-1.4.x.pip | 2 -
requirements/django-1.5.x.pip | 2 -
requirements/django-1.6.x.pip | 2 -
requirements/django-1.7.x.pip | 2 -
requirements/django-1.8.x.pip | 2 -
setup.py | 14 +-
tests/app/models.py | 14 +-
tests/app/settings.py | 29 +-
tests/app/urls.py | 13 +-
tests/columns/test_booleancolumn.py | 9 +-
tests/columns/test_checkboxcolumn.py | 7 +-
tests/columns/test_datecolumn.py | 5 +-
tests/columns/test_datetimecolumn.py | 7 +-
tests/columns/test_emailcolumn.py | 2 +
tests/columns/test_filecolumn.py | 9 +-
tests/columns/test_general.py | 27 +-
tests/columns/test_linkcolumn.py | 85 +++++-
tests/columns/test_urlcolumn.py | 2 +
tests/test_config.py | 7 +-
tests/test_core.py | 28 +-
tests/test_models.py | 29 +-
tests/test_templates.py | 67 +++--
tests/test_utils.py | 8 +-
tests/test_views.py | 5 +-
tests/utils.py | 35 ++-
tox.ini | 102 ++-----
55 files changed, 682 insertions(+), 762 deletions(-)
diff --cc debian/.git-dpm
index 18bcfcd,0000000..a62d891
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
- 33215fb37597ebc4b039b46822d6554d1f084395
- 33215fb37597ebc4b039b46822d6554d1f084395
- 7cb0fb4b7257da41155bae663e56db991f3222ca
++55b4f4fbc0e3c7922ae51188fc2358e1d0442aab
++55b4f4fbc0e3c7922ae51188fc2358e1d0442aab
++04b8a90dfa49efcf9a9f6acb2fbbf61b5edd7d7f
+04b8a90dfa49efcf9a9f6acb2fbbf61b5edd7d7f
+django-tables_1.0.7.orig.tar.gz
+41b4e2bf62c76fc99f3e6dd32ca9e53a96259b11
+113207
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/local_inventory
index fe37a12,0000000..6e77b41
mode 100644,000000..100644
--- a/debian/patches/local_inventory
+++ b/debian/patches/local_inventory
@@@ -1,27 -1,0 +1,27 @@@
- From 390af80278a7b3e4acf5dfa3ebe6ebc4390c80b8 Mon Sep 17 00:00:00 2001
++From 55b4f4fbc0e3c7922ae51188fc2358e1d0442aab 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
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -30,8 +30,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),
+ }
+
+
diff --cc debian/patches/series
index bc0f362,0000000..d891337
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+local_inventory
- dont_call_managers.patch
--
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