[Python-modules-commits] [drf-haystack] 06/17: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository drf-haystack.

commit 9c64bccb0fae31bd705102186f935675b10cd974
Merge: 3231bb6 602ac1a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Nov 13 08:27:12 2015 +0100

    merge patched into master

 LICENSE.txt                                        |   21 +
 MANIFEST.in                                        |    6 +
 PKG-INFO                                           |    6 +-
 README.rst                                         |    3 +-
 debian/.git-dpm                                    |    6 +-
 debian/patches/python3-io.patch                    |    4 +-
 docs/Makefile                                      |  177 +++
 docs/advanced_usage.rst                            |  918 ++++++++++++++
 docs/basic_usage.rst                               |  221 ++++
 docs/conf.py                                       |  298 +++++
 docs/index.rst                                     |  152 +++
 docs/make.bat                                      |  242 ++++
 drf_haystack.egg-info/PKG-INFO                     |    6 +-
 drf_haystack.egg-info/SOURCES.txt                  |   42 +-
 drf_haystack.egg-info/pbr.json                     |    1 -
 drf_haystack.egg-info/requires.txt                 |    2 +
 drf_haystack/__init__.py                           |    4 +-
 drf_haystack/filters.py                            |  143 ++-
 drf_haystack/generics.py                           |   61 +-
 drf_haystack/serializers.py                        |  180 ++-
 drf_haystack/utils.py                              |   31 +
 drf_haystack/viewsets.py                           |   36 +-
 requirements.txt                                   |   13 +
 setup.cfg                                          |    2 +-
 setup.py                                           |    9 +-
 tests/__init__.py                                  |   48 +
 tests/constants.py                                 |   17 +
 tests/mixins.py                                    |   17 +
 tests/mockapp/__init__.py                          |    0
 tests/mockapp/admin.py                             |    3 +
 tests/mockapp/fixtures/mocklocation.json           | 1302 ++++++++++++++++++++
 tests/mockapp/fixtures/mockperson.json             | 1002 +++++++++++++++
 tests/mockapp/fixtures/mockpet.json                |  102 ++
 tests/mockapp/migrations/0001_initial.py           |   29 +
 tests/mockapp/migrations/0002_mockperson.py        |   27 +
 tests/mockapp/migrations/0003_mockpet.py           |   28 +
 tests/mockapp/migrations/0004_load_fixtures.py     |   56 +
 tests/mockapp/migrations/__init__.py               |    0
 tests/mockapp/models.py                            |   57 +
 tests/mockapp/search_indexes.py                    |   86 ++
 tests/mockapp/serializers.py                       |   63 +
 .../search/indexes/mockapp/mocklocation_text.txt   |    3 +
 .../search/indexes/mockapp/mockperson_text.txt     |    1 +
 .../search/indexes/mockapp/mockpet_text.txt        |    1 +
 tests/mockapp/views.py                             |   39 +
 tests/runtests.py                                  |   25 +
 tests/settings.py                                  |  113 ++
 tests/test_filters.py                              |  462 +++++++
 tests/test_serializers.py                          |  677 ++++++++++
 tests/test_utils.py                                |   55 +
 tests/test_viewsets.py                             |  224 ++++
 tests/urls.py                                      |   17 +
 tests/wsgi.py                                      |   14 +
 tox.ini                                            |  152 +++
 54 files changed, 7159 insertions(+), 45 deletions(-)

diff --cc debian/.git-dpm
index b236bb5,0000000..695beb0
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 4d00cafe4f86f036c08905dd8a0d0b0137e58932
- 4d00cafe4f86f036c08905dd8a0d0b0137e58932
- 3608abe12b9ae82c777f867cf478199ba2813725
++602ac1a1abe7cb30ccb47984391d4b0d2e8c7b92
++602ac1a1abe7cb30ccb47984391d4b0d2e8c7b92
++7125c89ce546985031495b0a69bfac1378c50603
 +7125c89ce546985031495b0a69bfac1378c50603
 +drf-haystack_1.5.5.orig.tar.gz
 +a64189e0f31d21280105099fd100ac363adf6143
 +52065
diff --cc debian/patches/python3-io.patch
index d1301b1,0000000..5dad988
mode 100644,000000..100644
--- a/debian/patches/python3-io.patch
+++ b/debian/patches/python3-io.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 4d00cafe4f86f036c08905dd8a0d0b0137e58932 Mon Sep 17 00:00:00 2001
++From 602ac1a1abe7cb30ccb47984391d4b0d2e8c7b92 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Fri, 13 Nov 2015 08:25:39 +0100
 +Subject: Use io module to open UTF-8 encoded file.
 +
 +Forwarded: no
 +Last-Update: 2015-08-30
 +Patch-Name: python3-io.patch
 +---
 + setup.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 4ab8eb3..f192db9 100644
++index 9599f13..cda8700 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -2,6 +2,7 @@
 + 
 + import re
 + import os
 ++import io
 + 
 + try:
 +     from setuptools import setup
 +@@ -15,7 +16,7 @@ def get_version(package):
 +     """
 +     Return package version as listed in `__version__` in `init.py`.
 +     """
 +-    init_py = open(os.path.join(package, "__init__.py")).read()
 ++    init_py = io.open(os.path.join(package, "__init__.py"), encoding='utf-8').read()
 +     return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
 + 
 + setup(

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