[Python-modules-commits] [drf-haystack] 04/10: merge patched-experimental into experimental
Michael Fladischer
fladi at moszumanska.debian.org
Tue Mar 21 12:13:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch experimental
in repository drf-haystack.
commit a3eccff195ec0911c3fbb92204faeec0c3a9756b
Merge: 4dda1a0 c715d20
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Mar 21 12:48:34 2017 +0100
merge patched-experimental into experimental
MANIFEST.in | 2 +-
PKG-INFO | 6 +-
README.md | 66 ++
README.rst | 52 --
debian/.git-dpm | 6 +-
debian/patches/python3-io.patch | 4 +-
docs/{basic_usage.rst => 01_intro.rst} | 49 +-
docs/02_autocomplete.rst | 48 ++
docs/03_geospatial.rst | 86 ++
docs/04_highlighting.rst | 132 +++
docs/05_more_like_this.rst | 64 ++
docs/06_term_boost.rst | 55 ++
docs/07_faceting.rst | 316 +++++++
docs/08_permissions.rst | 34 +
docs/09_multiple_indexes.rst | 168 ++++
docs/10_tips_n_tricks.rst | 101 +++
docs/advanced_usage.rst | 936 ---------------------
docs/apidoc/drf_haystack.rst | 64 ++
docs/apidoc/modules.rst | 7 +
docs/conf.py | 23 +-
docs/index.rst | 109 ++-
drf_haystack.egg-info/PKG-INFO | 6 +-
drf_haystack.egg-info/SOURCES.txt | 22 +-
drf_haystack.egg-info/pbr.json | 1 +
drf_haystack.egg-info/requires.txt | 6 +-
drf_haystack/__init__.py | 2 +-
drf_haystack/constants.py | 4 +
drf_haystack/fields.py | 51 +-
drf_haystack/filters.py | 377 +++------
drf_haystack/generics.py | 112 +--
drf_haystack/mixins.py | 122 +++
drf_haystack/query.py | 311 +++++++
drf_haystack/serializers.py | 330 +++++---
drf_haystack/viewsets.py | 52 +-
requirements.txt | 6 +-
setup.cfg | 2 +-
setup.py | 10 +-
tests/__init__.py | 11 +-
tests/mockapp/apps.py | 9 +
tests/mockapp/fixtures/mockperson.json | 702 +++++++++-------
tests/mockapp/migrations/0004_load_fixtures.py | 1 +
.../migrations/0005_mockperson_birthdate.py | 21 +
tests/mockapp/models.py | 12 +
tests/mockapp/search_indexes.py | 11 +
tests/mockapp/serializers.py | 10 +-
tests/mockapp/views.py | 28 +-
tests/runtests.py | 7 +-
tests/settings.py | 49 +-
tests/test_filters.py | 74 +-
tests/test_serializers.py | 391 ++++-----
tests/test_viewsets.py | 128 ++-
tests/urls.py | 14 +-
tox.ini | 132 +--
53 files changed, 3011 insertions(+), 2331 deletions(-)
diff --cc debian/.git-dpm
index 91a3bc1,0000000..4a70333
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
- 366db6e9e18ee0564badead81b0d40b5a6cfc5bb
- 366db6e9e18ee0564badead81b0d40b5a6cfc5bb
- 35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
++c715d20dbd43bd24ac14d37639cdd3932c0d54c9
++c715d20dbd43bd24ac14d37639cdd3932c0d54c9
++2f1644596809464c3afe3363e8ce24f58b31f26d
+2f1644596809464c3afe3363e8ce24f58b31f26d
+drf-haystack_1.6.1.orig.tar.gz
+c6f601c02dd708c863862f6922f1bbc35aacc91e
+59177
diff --cc debian/patches/python3-io.patch
index 99a3a61,0000000..1d5a775
mode 100644,000000..100644
--- a/debian/patches/python3-io.patch
+++ b/debian/patches/python3-io.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 366db6e9e18ee0564badead81b0d40b5a6cfc5bb Mon Sep 17 00:00:00 2001
++From c715d20dbd43bd24ac14d37639cdd3932c0d54c9 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 696709d..0abcf26 100644
++index 9c7d9a3..c8e4bb7 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
More information about the Python-modules-commits
mailing list