[Python-modules-commits] [django-filter] 03/05: merge patched into master

Brian May bam at moszumanska.debian.org
Wed Apr 6 02:48:55 UTC 2016


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

bam pushed a commit to branch master
in repository django-filter.

commit c723d342113fabf76ff2c729b7b39f679215d213
Merge: 58c2c00 99b05f1
Author: Brian May <bam at debian.org>
Date:   Wed Apr 6 12:39:06 2016 +1000

    merge patched into master

 CHANGES.rst                                       |  40 ++
 MANIFEST.in                                       |   1 +
 PKG-INFO                                          |  24 +-
 README.rst                                        |  14 +-
 debian/.git-dpm                                   |   6 +-
 debian/patches/fix_tests.patch                    |  39 --
 debian/patches/series                             |   1 -
 django_filter.egg-info/PKG-INFO                   |  24 +-
 django_filter.egg-info/SOURCES.txt                |  57 +-
 django_filters/__init__.py                        |   2 +-
 django_filters/compat.py                          |  17 +
 django_filters/fields.py                          |  76 +-
 django_filters/filters.py                         | 180 ++++-
 django_filters/filterset.py                       | 245 ++++---
 django_filters/locale/es_AR/LC_MESSAGES/django.mo | Bin 0 -> 744 bytes
 django_filters/locale/es_AR/LC_MESSAGES/django.po |  47 ++
 django_filters/locale/pl/LC_MESSAGES/django.mo    | Bin 0 -> 1027 bytes
 django_filters/locale/pl/LC_MESSAGES/django.po    |  65 ++
 django_filters/locale/zh_CN/LC_MESSAGES/django.po |  64 ++
 django_filters/utils.py                           | 104 +++
 django_filters/widgets.py                         |  66 +-
 docs/_build/.DS_Store                             | Bin 6148 -> 0 bytes
 docs/_build/doctrees/environment.pickle           | Bin 22849 -> 0 bytes
 docs/_build/doctrees/index.doctree                | Bin 3564 -> 0 bytes
 docs/_build/doctrees/install.doctree              | Bin 3497 -> 0 bytes
 docs/_build/doctrees/ref/filters.doctree          | Bin 36171 -> 0 bytes
 docs/_build/doctrees/ref/widgets.doctree          | Bin 6552 -> 0 bytes
 docs/_build/doctrees/tests.doctree                | Bin 7673 -> 0 bytes
 docs/_build/doctrees/usage.doctree                | Bin 41428 -> 0 bytes
 docs/_build/html/.buildinfo                       |   4 -
 docs/_build/html/_sources/index.txt               |  19 -
 docs/_build/html/_sources/install.txt             |   5 -
 docs/_build/html/_sources/ref/filters.txt         | 201 ------
 docs/_build/html/_sources/ref/widgets.txt         |  19 -
 docs/_build/html/_sources/tests.txt               |  47 --
 docs/_build/html/_sources/usage.txt               | 280 --------
 docs/_build/html/_static/ajax-loader.gif          | Bin 673 -> 0 bytes
 docs/_build/html/_static/basic.css                | 537 --------------
 docs/_build/html/_static/comment-bright.png       | Bin 3500 -> 0 bytes
 docs/_build/html/_static/comment-close.png        | Bin 3578 -> 0 bytes
 docs/_build/html/_static/comment.png              | Bin 3445 -> 0 bytes
 docs/_build/html/_static/default.css              | 256 -------
 docs/_build/html/_static/doctools.js              | 238 -------
 docs/_build/html/_static/down-pressed.png         | Bin 368 -> 0 bytes
 docs/_build/html/_static/down.png                 | Bin 363 -> 0 bytes
 docs/_build/html/_static/file.png                 | Bin 392 -> 0 bytes
 docs/_build/html/_static/jquery.js                |   2 -
 docs/_build/html/_static/minus.png                | Bin 199 -> 0 bytes
 docs/_build/html/_static/plus.png                 | Bin 199 -> 0 bytes
 docs/_build/html/_static/pygments.css             |  63 --
 docs/_build/html/_static/searchtools.js           | 622 -----------------
 docs/_build/html/_static/sidebar.js               | 159 -----
 docs/_build/html/_static/underscore.js            |  31 -
 docs/_build/html/_static/up-pressed.png           | Bin 372 -> 0 bytes
 docs/_build/html/_static/up.png                   | Bin 363 -> 0 bytes
 docs/_build/html/_static/websupport.js            | 808 ----------------------
 docs/_build/html/genindex.html                    |  92 ---
 docs/_build/html/index.html                       | 114 ---
 docs/_build/html/install.html                     | 112 ---
 docs/_build/html/objects.inv                      | Bin 211 -> 0 bytes
 docs/_build/html/ref/filters.html                 | 319 ---------
 docs/_build/html/ref/widgets.html                 | 134 ----
 docs/_build/html/search.html                      |  99 ---
 docs/_build/html/searchindex.js                   |   1 -
 docs/_build/html/tests.html                       | 150 ----
 docs/_build/html/usage.html                       | 396 -----------
 docs/conf.py                                      |  10 +-
 docs/index.txt                                    |   2 +
 docs/install.txt                                  |   7 +-
 docs/ref/fields.txt                               |   2 +-
 docs/ref/filters.txt                              | 346 +++++++--
 docs/ref/filterset.txt                            | 164 +++++
 docs/ref/settings.txt                             |  24 +
 docs/ref/widgets.txt                              |  31 +-
 docs/usage.txt                                    | 262 +++----
 requirements/docs.txt                             |   1 -
 requirements/maintainer.txt                       |  31 +-
 requirements/test.txt                             |   2 +-
 requirements/travis-ci.txt                        |   2 +-
 runshell.py                                       |  23 +-
 runtests.py                                       |  30 +-
 setup.py                                          |  18 +-
 tests/models.py                                   |  21 +-
 tests/settings.py                                 |  29 +
 tests/test_fields.py                              | 138 +++-
 tests/test_filtering.py                           | 306 +++++++-
 tests/test_filters.py                             | 301 +++++++-
 tests/test_filterset.py                           | 146 +++-
 tests/test_forms.py                               |   5 +-
 tests/test_utils.py                               | 166 +++++
 tests/test_views.py                               |   5 +-
 tests/test_widgets.py                             |  83 +++
 tests/urls.py                                     |  13 +-
 93 files changed, 2565 insertions(+), 5383 deletions(-)

diff --cc debian/.git-dpm
index a631341,0000000..b9bdad6
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
- d2e50dcc8fd58b62ccca7adcaf3d90fe0e88d40b
- d2e50dcc8fd58b62ccca7adcaf3d90fe0e88d40b
- 9b2333ed6baed573a0058790b9678bb619d21bda
++99b05f1fbdb81b1494e5cfa89576e493450b30b1
++99b05f1fbdb81b1494e5cfa89576e493450b30b1
++99b05f1fbdb81b1494e5cfa89576e493450b30b1
 +99b05f1fbdb81b1494e5cfa89576e493450b30b1
 +django-filter_0.13.0.orig.tar.gz
 +7dd049fd0e2d82e329bdc73bb30f1e306edc7b5c
 +94527
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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



More information about the Python-modules-commits mailing list