[Python-modules-commits] [django-tables] 05/07: change version to 1.0.4-1 (UNRELEASED) New upstream version.
Brian May
bam at moszumanska.debian.org
Thu Oct 22 03:33:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-tables.
commit 5a0fc271d323f3e5a592b8d96376c5fc3e2f3081
Merge: 7130cef 33215fb
Author: Brian May <bam at debian.org>
Date: Thu Oct 22 10:44:55 2015 +1100
change version to 1.0.4-1 (UNRELEASED)
New upstream version.
.travis.yml | 18 +-
README.rst => README.md | 132 ++-
debian/.git-dpm | 6 +-
debian/changelog | 6 +
debian/patches/django18.patch | 52 -
debian/patches/dont_call_managers.patch | 4 +-
debian/patches/local_inventory | 2 +-
debian/patches/remove_sorteddict.patch | 109 --
debian/patches/series | 2 -
django_tables2/__init__.py | 4 +-
django_tables2/columns/base.py | 74 +-
django_tables2/locale/de/LC_MESSAGES/django.mo | Bin 0 -> 646 bytes
django_tables2/locale/de/LC_MESSAGES/django.po | 37 +
django_tables2/locale/sv/LC_MESSAGES/django.mo | Bin 0 -> 606 bytes
django_tables2/locale/sv/LC_MESSAGES/django.po | 32 +
django_tables2/rows.py | 3 +-
django_tables2/tables.py | 16 +-
django_tables2/templatetags/django_tables2.py | 2 +-
django_tables2/utils.py | 2 +-
docs/index.rst | 1268 +-----------------------
docs/pages/accessors.rst | 30 +
docs/pages/api-reference.rst | 322 ++++++
docs/pages/builtin-columns.rst | 18 +
docs/pages/column-attributes.rst | 28 +
docs/pages/column-headers.rst | 39 +
docs/pages/custom-rendering.rst | 142 +++
docs/pages/generic-mixins.rst | 63 ++
docs/pages/glossary.rst | 57 ++
docs/{ => pages}/internal.rst | 0
docs/pages/localization-control.rst | 50 +
docs/pages/order-by-accessors.rst | 48 +
docs/pages/pagination.rst | 24 +
docs/pages/query-string-fields.rst | 34 +
docs/pages/swapping-columns.rst | 21 +
docs/pages/table-data.rst | 48 +
docs/pages/table-mixins.rst | 31 +
docs/pages/tables-for-models.rst | 33 +
docs/pages/template-filters.rst | 19 +
docs/pages/template-tags.rst | 66 ++
docs/pages/tutorial.rst | 97 ++
docs/pages/upgrading-from-v1.rst | 62 ++
requirements/common.pip | 8 +
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 +
requirements/django-dev.pip | 2 +
setup.py | 8 +-
tests/__init__.py | 49 -
tests/app/models.py | 8 +-
tests/columns.py | 839 ----------------
tests/columns/__init__.py | 0
tests/columns/test_booleancolumn.py | 56 ++
tests/columns/test_checkboxcolumn.py | 31 +
tests/columns/test_datecolumn.py | 66 ++
tests/columns/test_datetimecolumn.py | 81 ++
tests/columns/test_emailcolumn.py | 39 +
tests/columns/test_filecolumn.py | 81 ++
tests/columns/test_general.py | 329 ++++++
tests/columns/test_linkcolumn.py | 95 ++
tests/columns/test_templatecolumn.py | 36 +
tests/columns/test_urlcolumn.py | 26 +
tests/{config.py => test_config.py} | 25 +-
tests/{core.py => test_core.py} | 154 ++-
tests/{models.py => test_models.py} | 58 +-
tests/{rows.py => test_rows.py} | 22 +-
tests/{templates.py => test_templates.py} | 207 ++--
tests/{utils.py => test_utils.py} | 56 +-
tests/{views.py => test_views.py} | 14 +-
tests/utils.py | 204 +---
tox.ini | 210 +---
73 files changed, 2690 insertions(+), 3027 deletions(-)
diff --cc debian/.git-dpm
index dce1dd5,0000000..e885644
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
- db1e5930cc1391e9c1b9f015570bad2dd4d4d1e7
- db1e5930cc1391e9c1b9f015570bad2dd4d4d1e7
- 5355caf975e1c39a321703ca8846e198c626f1a6
++33215fb37597ebc4b039b46822d6554d1f084395
++33215fb37597ebc4b039b46822d6554d1f084395
++7cb0fb4b7257da41155bae663e56db991f3222ca
+7cb0fb4b7257da41155bae663e56db991f3222ca
+django-tables_1.0.4.orig.tar.gz
+cfeffceec4fa8db6cdec48a5f4b41b9c8a213ad0
+110058
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 51771c0,0000000..0fe762e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,110 -1,0 +1,116 @@@
++django-tables (1.0.4-1) UNRELEASED; urgency=medium
++
++ * New upstream version.
++
++ -- Brian May <bam at debian.org> Thu, 22 Oct 2015 10:44:56 +1100
++
+django-tables (0.15.0-4) unstable; urgency=medium
+
+ * Fix debian/watch.
+ * Add patch for Django 1.8 compatibility.
+ * Swap Maintainer and Uploaders. Maintainer is now DPMT.
+
+ -- Brian May <bam at debian.org> Thu, 22 Oct 2015 10:17:32 +1100
+
+django-tables (0.15.0-3) unstable; urgency=low
+
+ * Add patch from https://github.com/bradleyayers/django-tables2/pull/214 as
+ dont_call_managers.patch to fix problems with many to many fields. See
+ https://github.com/bradleyayers/django-tables2/issues/211 for details.
+ * Add patch from
+ https://github.com/luzfcb/django-tables2/commit/f3613c41208b0e7080777416f13ea2de6c65da02
+ as remove_sorteddict.patch to remove depreciated use of SortedDict.
+ See https://github.com/bradleyayers/django-tables2/issues/212 for details.
+
+ -- Brian May <bam at debian.org> Fri, 17 Oct 2014 09:54:38 +1100
+
+django-tables (0.15.0-2) unstable; urgency=low
+
+ * Python3 package.
+
+ -- Brian May <bam at debian.org> Fri, 04 Apr 2014 09:42:10 +1100
+
+django-tables (0.15.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Brian May <bam at debian.org> Fri, 04 Apr 2014 08:55:48 +1100
+
+django-tables (0.13.0-3) unstable; urgency=low
+
+ * Fix typo in debian/control, broke upgrades. Fixes: #717999.
+
+ -- Brian May <bam at debian.org> Sun, 28 Jul 2013 10:41:44 +1000
+
+django-tables (0.13.0-2) unstable; urgency=low
+
+ * Set DPMT as Uploaders.
+ * Switch to dh_python2.
+ * Bump Standards version to 3.9.4.
+ * Bump debhelper Build-Depends to >= 8.1.0~.
+ * Rename to python-django-filter, provide transitional dummy package
+ * Build documentation with sphinx and move it to separate package
+ python-django-filter-doc.
+ * Change short and long description.
+ * Make dependencies on python-django versioned.
+ * Drop debian/pycompat.
+ * Add X-Python-Version.
+ * Use DEP5 format for d/copyright.
+ * Add d/watch file.
+ * Move Homepage field to source section.
+
+ -- Brian May <bam at debian.org> Thu, 20 Jun 2013 10:18:20 +1000
+
+django-tables (0.13.0-1) unstable; urgency=low
+
+ * New upstream version.
+ * Requires Django 1.2 or newer.
+
+ -- Brian May <bam at debian.org> Sun, 21 Oct 2012 10:47:50 +1100
+
+django-tables (0.11.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Brian May <bam at debian.org> Tue, 18 Sep 2012 09:41:45 +1000
+
+django-tables (0.10.2-2) unstable; urgency=low
+
+ * Don't import views.py by default, breaks Python 2.6.
+ * Fix incorrect depreciation warning.
+
+ -- Brian May <bam at debian.org> Sun, 01 Apr 2012 09:09:03 +1000
+
+django-tables (0.10.2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Bugs fixed.
+ * Django 1.4 support.
+
+ -- Brian May <bam at debian.org> Wed, 28 Mar 2012 12:21:19 +1100
+
+django-tables (0.9.6-2) unstable; urgency=low
+
+ * Resolve compatibility issues with Debian/squeeze.
+
+ -- Brian May <bam at debian.org> Tue, 13 Mar 2012 11:55:12 +1100
+
+django-tables (0.9.6-1) unstable; urgency=low
+
+ * New upstream version from
+ https://github.com/bradleyayers/django-tables2 fork
+ * Major incompatible non-backwards compatible changes.
+
+ -- Brian May <bam at debian.org> Mon, 05 Mar 2012 14:23:32 +1100
+
+django-tables (0.2.1-2) unstable; urgency=low
+
+ * Remove redundant line from debian/rules.
+
+ -- Brian May <bam at debian.org> Fri, 08 Apr 2011 10:34:18 +1000
+
+django-tables (0.2.1-1) unstable; urgency=low
+
+ * Initial release. Closes: #619194.
+
+ -- Brian May <bam at debian.org> Mon, 28 Mar 2011 11:37:40 +1100
diff --cc debian/patches/dont_call_managers.patch
index 3c5a929,0000000..cc9d66b
mode 100644,000000..100644
--- a/debian/patches/dont_call_managers.patch
+++ b/debian/patches/dont_call_managers.patch
@@@ -1,24 -1,0 +1,24 @@@
- From b543d08db00753c06af0fb232645e94e2011bad3 Mon Sep 17 00:00:00 2001
++From 33215fb37597ebc4b039b46822d6554d1f084395 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:57:47 -0700
+Subject: dont_call_managers
+
+Patch-Name: dont_call_managers.patch
+---
+ django_tables2/utils.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/django_tables2/utils.py b/django_tables2/utils.py
- index 3d1c2c9..67b2b7c 100644
++index 078c7fd..b4ca445 100644
+--- a/django_tables2/utils.py
++++ b/django_tables2/utils.py
+@@ -377,7 +377,8 @@ class Accessor(str):
+ if safe and getattr(current, 'alters_data', False):
+ raise ValueError('refusing to call %s() because `.alters_data = True`'
+ % repr(current))
+- current = current()
++ if not getattr(current, 'do_not_call_in_templates', False):
++ current = current()
+ # important that we break in None case, or a relationship
+ # spanning across a null-key will raise an exception in the
+ # next iteration, instead of defaulting.
diff --cc debian/patches/local_inventory
index a078e6f,0000000..fe37a12
mode 100644,000000..100644
--- a/debian/patches/local_inventory
+++ b/debian/patches/local_inventory
@@@ -1,27 -1,0 +1,27 @@@
- From 0cf4d568ec59a7b73a1f0253cc2db3793fea1fad Mon Sep 17 00:00:00 2001
++From 390af80278a7b3e4acf5dfa3ebe6ebc4390c80b8 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 b56c407,0000000..bc0f362
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,2 @@@
- django18.patch
+local_inventory
+dont_call_managers.patch
- remove_sorteddict.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