[Python-modules-commits] [django-haystack] 03/10: Import django-haystack_2.5.0.orig.tar.gz

Michael Fladischer fladi at moszumanska.debian.org
Sun Aug 21 10:41:54 UTC 2016


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

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

commit a01b8d38d39411729039d34913668a9eb2787451
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Aug 21 10:28:53 2016 +0200

    Import django-haystack_2.5.0.orig.tar.gz
---
 .gitchangelog.rc                                   |  191 +
 .github/issue_template.md                          |   18 +
 .github/pull_request_template.md                   |    3 +
 .gitignore                                         |   18 +
 .isort.cfg                                         |    4 +
 .travis.yml                                        |   57 +
 .../_sources/contributing.txt => CONTRIBUTING.md   |   93 +-
 PKG-INFO                                           |   82 -
 django_haystack.egg-info/PKG-INFO                  |   82 -
 django_haystack.egg-info/SOURCES.txt               |  244 --
 django_haystack.egg-info/dependency_links.txt      |    1 -
 django_haystack.egg-info/not-zip-safe              |    1 -
 django_haystack.egg-info/pbr.json                  |    1 -
 django_haystack.egg-info/requires.txt              |    2 -
 django_haystack.egg-info/top_level.txt             |    1 -
 docs/backend_support.rst                           |   37 +-
 docs/build/.buildinfo                              |    4 -
 docs/build/.doctrees/admin.doctree                 |  Bin 6819 -> 0 bytes
 docs/build/.doctrees/architecture_overview.doctree |  Bin 14617 -> 0 bytes
 docs/build/.doctrees/autocomplete.doctree          |  Bin 24292 -> 0 bytes
 docs/build/.doctrees/backend_support.doctree       |  Bin 36327 -> 0 bytes
 docs/build/.doctrees/best_practices.doctree        |  Bin 43798 -> 0 bytes
 docs/build/.doctrees/boost.doctree                 |  Bin 17613 -> 0 bytes
 docs/build/.doctrees/changelog.doctree             |  Bin 885123 -> 0 bytes
 docs/build/.doctrees/contributing.doctree          |  Bin 30899 -> 0 bytes
 docs/build/.doctrees/creating_new_backends.doctree |  Bin 7749 -> 0 bytes
 docs/build/.doctrees/debugging.doctree             |  Bin 25810 -> 0 bytes
 docs/build/.doctrees/environment.pickle            |  Bin 200379 -> 0 bytes
 docs/build/.doctrees/faceting.doctree              |  Bin 45945 -> 0 bytes
 docs/build/.doctrees/faq.doctree                   |  Bin 22334 -> 0 bytes
 docs/build/.doctrees/glossary.doctree              |  Bin 17476 -> 0 bytes
 docs/build/.doctrees/highlighting.doctree          |  Bin 15371 -> 0 bytes
 docs/build/.doctrees/index.doctree                 |  Bin 17099 -> 0 bytes
 docs/build/.doctrees/inputtypes.doctree            |  Bin 29067 -> 0 bytes
 .../.doctrees/installing_search_engines.doctree    |  Bin 35435 -> 0 bytes
 docs/build/.doctrees/management_commands.doctree   |  Bin 27602 -> 0 bytes
 docs/build/.doctrees/migration_from_1_to_2.doctree |  Bin 45159 -> 0 bytes
 docs/build/.doctrees/multiple_index.doctree        |  Bin 29818 -> 0 bytes
 docs/build/.doctrees/other_apps.doctree            |  Bin 19690 -> 0 bytes
 docs/build/.doctrees/python3.doctree               |  Bin 9836 -> 0 bytes
 .../.doctrees/rich_content_extraction.doctree      |  Bin 11782 -> 0 bytes
 docs/build/.doctrees/running_tests.doctree         |  Bin 13167 -> 0 bytes
 docs/build/.doctrees/searchbackend_api.doctree     |  Bin 32108 -> 0 bytes
 docs/build/.doctrees/searchfield_api.doctree       |  Bin 57599 -> 0 bytes
 docs/build/.doctrees/searchindex_api.doctree       |  Bin 111639 -> 0 bytes
 docs/build/.doctrees/searchquery_api.doctree       |  Bin 80456 -> 0 bytes
 docs/build/.doctrees/searchqueryset_api.doctree    |  Bin 178006 -> 0 bytes
 docs/build/.doctrees/searchresult_api.doctree      |  Bin 18458 -> 0 bytes
 docs/build/.doctrees/settings.doctree              |  Bin 51741 -> 0 bytes
 docs/build/.doctrees/signal_processors.doctree     |  Bin 25018 -> 0 bytes
 docs/build/.doctrees/spatial.doctree               |  Bin 69553 -> 0 bytes
 docs/build/.doctrees/templatetags.doctree          |  Bin 10403 -> 0 bytes
 docs/build/.doctrees/toc.doctree                   |  Bin 4799 -> 0 bytes
 docs/build/.doctrees/tutorial.doctree              |  Bin 61389 -> 0 bytes
 docs/build/.doctrees/utils.doctree                 |  Bin 5599 -> 0 bytes
 docs/build/.doctrees/views_and_forms.doctree       |  Bin 72743 -> 0 bytes
 docs/build/.doctrees/who_uses.doctree              |  Bin 47146 -> 0 bytes
 docs/build/_sources/admin.txt                      |   47 -
 docs/build/_sources/architecture_overview.txt      |   66 -
 docs/build/_sources/autocomplete.txt               |  220 -
 docs/build/_sources/backend_support.txt            |  127 -
 docs/build/_sources/best_practices.txt             |  263 --
 docs/build/_sources/boost.txt                      |  123 -
 docs/build/_sources/changelog.txt                  | 4575 --------------------
 docs/build/_sources/creating_new_backends.txt      |   34 -
 docs/build/_sources/debugging.txt                  |  107 -
 docs/build/_sources/faceting.txt                   |  324 --
 docs/build/_sources/faq.txt                        |  117 -
 docs/build/_sources/glossary.txt                   |   76 -
 docs/build/_sources/highlighting.txt               |   77 -
 docs/build/_sources/index.txt                      |  123 -
 docs/build/_sources/inputtypes.txt                 |  177 -
 docs/build/_sources/installing_search_engines.txt  |  218 -
 docs/build/_sources/management_commands.txt        |  201 -
 docs/build/_sources/migration_from_1_to_2.txt      |  285 --
 docs/build/_sources/multiple_index.txt             |  201 -
 docs/build/_sources/other_apps.txt                 |   98 -
 docs/build/_sources/python3.txt                    |   47 -
 docs/build/_sources/rich_content_extraction.txt    |   68 -
 docs/build/_sources/running_tests.txt              |   70 -
 docs/build/_sources/searchbackend_api.txt          |  124 -
 docs/build/_sources/searchfield_api.txt            |  262 --
 docs/build/_sources/searchindex_api.txt            |  618 ---
 docs/build/_sources/searchquery_api.txt            |  336 --
 docs/build/_sources/searchqueryset_api.txt         |  894 ----
 docs/build/_sources/searchresult_api.txt           |   62 -
 docs/build/_sources/settings.txt                   |  324 --
 docs/build/_sources/signal_processors.txt          |  117 -
 docs/build/_sources/spatial.txt                    |  412 --
 docs/build/_sources/templatetags.txt               |   68 -
 docs/build/_sources/toc.txt                        |   53 -
 docs/build/_sources/tutorial.txt                   |  398 --
 docs/build/_sources/utils.txt                      |   18 -
 docs/build/_sources/views_and_forms.txt            |  408 --
 docs/build/_sources/who_uses.txt                   |  357 --
 docs/build/_static/ajax-loader.gif                 |  Bin 673 -> 0 bytes
 docs/build/_static/basic.css                       |  537 ---
 docs/build/_static/comment-bright.png              |  Bin 3500 -> 0 bytes
 docs/build/_static/comment-close.png               |  Bin 3578 -> 0 bytes
 docs/build/_static/comment.png                     |  Bin 3445 -> 0 bytes
 docs/build/_static/default.css                     |  256 --
 docs/build/_static/doctools.js                     |  238 -
 docs/build/_static/down-pressed.png                |  Bin 368 -> 0 bytes
 docs/build/_static/down.png                        |  Bin 363 -> 0 bytes
 docs/build/_static/file.png                        |  Bin 392 -> 0 bytes
 docs/build/_static/jquery.js                       |    2 -
 docs/build/_static/minus.png                       |  Bin 199 -> 0 bytes
 docs/build/_static/plus.png                        |  Bin 199 -> 0 bytes
 docs/build/_static/pygments.css                    |   63 -
 docs/build/_static/searchtools.js                  |  622 ---
 docs/build/_static/sidebar.js                      |  159 -
 docs/build/_static/underscore.js                   |   31 -
 docs/build/_static/up-pressed.png                  |  Bin 372 -> 0 bytes
 docs/build/_static/up.png                          |  Bin 363 -> 0 bytes
 docs/build/_static/websupport.js                   |  808 ----
 docs/build/admin.html                              |  153 -
 docs/build/architecture_overview.html              |  179 -
 docs/build/autocomplete.html                       |  324 --
 docs/build/backend_support.html                    |  295 --
 docs/build/best_practices.html                     |  359 --
 docs/build/boost.html                              |  229 -
 docs/build/changelog.html                          | 4405 -------------------
 docs/build/contributing.html                       |  252 --
 docs/build/creating_new_backends.html              |  147 -
 docs/build/debugging.html                          |  220 -
 docs/build/faceting.html                           |  420 --
 docs/build/faq.html                                |  221 -
 docs/build/genindex.html                           |  738 ----
 docs/build/glossary.html                           |  170 -
 docs/build/highlighting.html                       |  185 -
 docs/build/index.html                              |  310 --
 docs/build/inputtypes.html                         |  294 --
 docs/build/installing_search_engines.html          |  320 --
 docs/build/management_commands.html                |  307 --
 docs/build/migration_from_1_to_2.html              |  385 --
 docs/build/multiple_index.html                     |  307 --
 docs/build/objects.inv                             |  Bin 1941 -> 0 bytes
 docs/build/other_apps.html                         |  204 -
 docs/build/python3.html                            |  152 -
 docs/build/rich_content_extraction.html            |  176 -
 docs/build/running_tests.html                      |  176 -
 docs/build/search.html                             |   99 -
 docs/build/searchbackend_api.html                  |  255 --
 docs/build/searchfield_api.html                    |  410 --
 docs/build/searchindex.js                          |    1 -
 docs/build/searchindex_api.html                    |  731 ----
 docs/build/searchquery_api.html                    |  531 ---
 docs/build/searchqueryset_api.html                 | 1060 -----
 docs/build/searchresult_api.html                   |  185 -
 docs/build/settings.html                           |  391 --
 docs/build/signal_processors.html                  |  217 -
 docs/build/spatial.html                            |  550 ---
 docs/build/templatetags.html                       |  174 -
 docs/build/toc.html                                |  395 --
 docs/build/tutorial.html                           |  487 ---
 docs/build/utils.html                              |  120 -
 docs/build/views_and_forms.html                    |  517 ---
 docs/build/who_uses.html                           |  436 --
 docs/conf.py                                       |    4 +-
 example_project/__init__.py                        |    0
 example_project/bare_bones_app/__init__.py         |    0
 example_project/bare_bones_app/models.py           |   22 +
 example_project/bare_bones_app/search_indexes.py   |   16 +
 example_project/regular_app/__init__.py            |    0
 example_project/regular_app/models.py              |   47 +
 example_project/regular_app/search_indexes.py      |   36 +
 example_project/settings.py                        |   48 +
 .../search/indexes/bare_bones_app/cat_text.txt     |    2 +
 .../search/indexes/regular_app/dog_text.txt        |    7 +
 haystack/__init__.py                               |    2 +-
 haystack/fields.py                                 |    8 +-
 setup.cfg                                          |   24 +-
 setup.py                                           |    2 +-
 test_haystack/__init__.py                          |   31 +
 test_haystack/core/__init__.py                     |    0
 test_haystack/core/admin.py                        |   18 +
 test_haystack/core/custom_identifier.py            |   11 +
 test_haystack/core/fixtures/base_data.json         |   74 +
 test_haystack/core/fixtures/bulk_data.json         |  262 ++
 test_haystack/core/models.py                       |  100 +
 test_haystack/core/templates/404.html              |    1 +
 test_haystack/core/templates/base.html             |    0
 .../core/templates/search/indexes/bar.txt          |    1 +
 .../search/indexes/core/mockmodel_content.txt      |    2 +
 .../search/indexes/core/mockmodel_extra.txt        |    2 +
 .../search/indexes/core/mockmodel_template.txt     |    2 +
 .../search/indexes/core/mockmodel_text.txt         |    2 +
 .../core/templates/search/indexes/foo.txt          |    1 +
 test_haystack/core/templates/search/search.html    |    1 +
 test_haystack/core/templates/test_suggestion.html  |    1 +
 test_haystack/core/urls.py                         |   27 +
 test_haystack/discovery/__init__.py                |    0
 test_haystack/discovery/models.py                  |   21 +
 test_haystack/discovery/search_indexes.py          |   21 +
 .../templates/search/indexes/bar_text.txt          |    2 +
 test_haystack/elasticsearch_tests/__init__.py      |   22 +
 .../test_elasticsearch_backend.py                  | 1503 +++++++
 .../test_elasticsearch_query.py                    |  217 +
 test_haystack/elasticsearch_tests/test_inputs.py   |   85 +
 test_haystack/mocks.py                             |  158 +
 test_haystack/multipleindex/__init__.py            |   23 +
 test_haystack/multipleindex/models.py              |   21 +
 test_haystack/multipleindex/routers.py             |   11 +
 test_haystack/multipleindex/search_indexes.py      |   37 +
 test_haystack/multipleindex/tests.py               |  323 ++
 test_haystack/results_per_page_urls.py             |   17 +
 test_haystack/run_tests.py                         |   28 +
 test_haystack/settings.py                          |   95 +
 test_haystack/simple_tests/__init__.py             |    4 +
 test_haystack/simple_tests/search_indexes.py       |   23 +
 test_haystack/simple_tests/test_simple_backend.py  |  154 +
 test_haystack/simple_tests/test_simple_query.py    |   42 +
 test_haystack/solr_tests/__init__.py               |   10 +
 .../solr_tests/content_extraction/test.pdf         |  Bin 0 -> 48184 bytes
 test_haystack/solr_tests/server/.gitignore         |    1 +
 .../solr_tests/server/get-solr-download-url.py     |   53 +
 test_haystack/solr_tests/server/schema.xml         |  159 +
 test_haystack/solr_tests/server/solrconfig.xml     | 1754 ++++++++
 .../solr_tests/server/start-solr-test-server.sh    |   58 +
 test_haystack/solr_tests/server/wait-for-solr      |   38 +
 test_haystack/solr_tests/test_admin.py             |   80 +
 test_haystack/solr_tests/test_inputs.py            |   89 +
 .../solr_tests/test_management_commands.py         |  250 ++
 test_haystack/solr_tests/test_solr_backend.py      | 1443 ++++++
 test_haystack/solr_tests/test_solr_query.py        |  192 +
 test_haystack/solr_tests/test_templatetags.py      |   62 +
 test_haystack/spatial/__init__.py                  |    8 +
 .../spatial/fixtures/sample_spatial_data.json      |  112 +
 test_haystack/spatial/models.py                    |   32 +
 test_haystack/spatial/search_indexes.py            |   24 +
 test_haystack/spatial/test_spatial.py              |  190 +
 test_haystack/test_altered_internal_names.py       |   93 +
 test_haystack/test_app_loading.py                  |   60 +
 test_haystack/test_app_using_appconfig/__init__.py |    5 +
 test_haystack/test_app_using_appconfig/apps.py     |    8 +
 .../migrations/0001_initial.py                     |   23 +
 .../migrations/__init__.py                         |    0
 test_haystack/test_app_using_appconfig/models.py   |    9 +
 .../test_app_using_appconfig/search_indexes.py     |   14 +
 test_haystack/test_app_using_appconfig/tests.py    |   17 +
 test_haystack/test_app_with_hierarchy/__init__.py  |    1 +
 .../test_app_with_hierarchy/contrib/__init__.py    |    0
 .../contrib/django/__init__.py                     |    0
 .../django/hierarchal_app_django/__init__.py       |    0
 .../contrib/django/hierarchal_app_django/models.py |   12 +
 test_haystack/test_app_without_models/__init__.py  |    0
 test_haystack/test_app_without_models/urls.py      |   11 +
 test_haystack/test_app_without_models/views.py     |    9 +
 test_haystack/test_backends.py                     |   65 +
 test_haystack/test_discovery.py                    |   56 +
 test_haystack/test_fields.py                       |  706 +++
 test_haystack/test_forms.py                        |  155 +
 test_haystack/test_generic_views.py                |   78 +
 test_haystack/test_indexes.py                      |  685 +++
 test_haystack/test_inputs.py                       |   86 +
 test_haystack/test_loading.py                      |  352 ++
 test_haystack/test_management_commands.py          |  111 +
 test_haystack/test_managers.py                     |  233 +
 test_haystack/test_models.py                       |  185 +
 test_haystack/test_query.py                        |  862 ++++
 test_haystack/test_templatetags.py                 |  103 +
 test_haystack/test_utils.py                        |  190 +
 test_haystack/test_views.py                        |  283 ++
 test_haystack/utils.py                             |   20 +
 test_haystack/whoosh_tests/__init__.py             |    4 +
 test_haystack/whoosh_tests/test_forms.py           |   37 +
 test_haystack/whoosh_tests/test_inputs.py          |   82 +
 test_haystack/whoosh_tests/test_whoosh_backend.py  | 1115 +++++
 test_haystack/whoosh_tests/test_whoosh_query.py    |  152 +
 test_haystack/whoosh_tests/testcases.py            |   46 +
 tox.ini                                            |   79 +
 271 files changed, 14371 insertions(+), 32829 deletions(-)

diff --git a/.gitchangelog.rc b/.gitchangelog.rc
new file mode 100644
index 0000000..1670908
--- /dev/null
+++ b/.gitchangelog.rc
@@ -0,0 +1,191 @@
+##
+## Format
+##
+##   ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
+##
+## Description
+##
+##   ACTION is one of 'chg', 'fix', 'new'
+##
+##       Is WHAT the change is about.
+##
+##       'chg' is for refactor, small improvement, cosmetic changes...
+##       'fix' is for bug fixes
+##       'new' is for new features, big improvement
+##
+##   AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
+##
+##       Is WHO is concerned by the change.
+##
+##       'dev'  is for developpers (API changes, refactors...)
+##       'usr'  is for final users (UI changes)
+##       'pkg'  is for packagers   (packaging changes)
+##       'test' is for testers     (test only related changes)
+##       'doc'  is for doc guys    (doc only changes)
+##
+##   COMMIT_MSG is ... well ... the commit message itself.
+##
+##   TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
+##
+##       They are preceded with a '!' or a '@' (prefer the former, as the
+##       latter is wrongly interpreted in github.) Commonly used tags are:
+##
+##       'refactor' is obviously for refactoring code only
+##       'minor' is for a very meaningless change (a typo, adding a comment)
+##       'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
+##       'wip' is for partial functionality but complete subfunctionality.
+##
+## Example:
+##
+##   new: usr: support of bazaar implemented
+##   chg: re-indentend some lines !cosmetic
+##   new: dev: updated code to be compatible with last version of killer lib.
+##   fix: pkg: updated year of licence coverage.
+##   new: test: added a bunch of test around user usability of feature X.
+##   fix: typo in spelling my name in comment. !minor
+##
+##   Please note that multi-line commit message are supported, and only the
+##   first line will be considered as the "summary" of the commit message. So
+##   tags, and other rules only applies to the summary.  The body of the commit
+##   message will be displayed in the changelog without reformatting.
+
+
+##
+## ``ignore_regexps`` is a line of regexps
+##
+## Any commit having its full commit message matching any regexp listed here
+## will be ignored and won't be reported in the changelog.
+##
+ignore_regexps = [
+        r'@minor', r'!minor',
+        r'@cosmetic', r'!cosmetic',
+        r'@refactor', r'!refactor',
+        r'@wip', r'!wip',
+        r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
+        r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
+        r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
+  ]
+
+
+## ``section_regexps`` is a list of 2-tuples associating a string label and a
+## list of regexp
+##
+## Commit messages will be classified in sections thanks to this. Section
+## titles are the label, and a commit is classified under this section if any
+## of the regexps associated is matching.
+##
+section_regexps = [
+    ('New', [
+	r'^[nN]ew\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+     ]),
+    ('Changes', [
+        r'^[cC]hg\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+     ]),
+    ('Fix', [
+        r'^[fF]ix\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+     ]),
+
+    ('Other', None ## Match all lines
+     ),
+
+]
+
+
+## ``body_process`` is a callable
+##
+## This callable will be given the original body and result will
+## be used in the changelog.
+##
+## Available constructs are:
+##
+##   - any python callable that take one txt argument and return txt argument.
+##
+##   - ReSub(pattern, replacement): will apply regexp substitution.
+##
+##   - Indent(chars="  "): will indent the text with the prefix
+##     Please remember that template engines gets also to modify the text and
+##     will usually indent themselves the text if needed.
+##
+##   - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
+##
+##   - noop: do nothing
+##
+##   - ucfirst: ensure the first letter is uppercase.
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - final_dot: ensure text finishes with a dot
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - strip: remove any spaces before or after the content of the string
+##
+## Additionally, you can `pipe` the provided filters, for instance:
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars="  ")
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
+#body_process = noop
+body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
+
+
+## ``subject_process`` is a callable
+##
+## This callable will be given the original subject and result will
+## be used in the changelog.
+##
+## Available constructs are those listed in ``body_process`` doc.
+subject_process = (strip |
+    ReSub(r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n@]*)(@[a-z]+\s+)*$', r'\4') |
+    ucfirst | final_dot)
+
+
+## ``tag_filter_regexp`` is a regexp
+##
+## Tags that will be used for the changelog must match this regexp.
+##
+tag_filter_regexp = r'^v[0-9]+\.[0-9]+(\.[0-9]+)?$'
+
+
+## ``unreleased_version_label`` is a string
+##
+## This label will be used as the changelog Title of the last set of changes
+## between last valid tag and HEAD if any.
+unreleased_version_label = "%%version%% (unreleased)"
+
+
+## ``output_engine`` is a callable
+##
+## This will change the output format of the generated changelog file
+##
+## Available choices are:
+##
+##   - rest_py
+##
+##        Legacy pure python engine, outputs ReSTructured text.
+##        This is the default.
+##
+##   - mustache(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mustache/*.tpl``.
+##        Requires python package ``pystache``.
+##        Examples:
+##           - mustache("markdown")
+##           - mustache("restructuredtext")
+##
+##   - makotemplate(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mako/*.tpl``.
+##        Requires python package ``mako``.
+##        Examples:
+##           - makotemplate("restructuredtext")
+##
+output_engine = rest_py
+#output_engine = mustache("restructuredtext")
+#output_engine = mustache("markdown")
+#output_engine = makotemplate("restructuredtext")
+
+
+## ``include_merge`` is a boolean
+##
+## This option tells git-log whether to include merge commits in the log.
+## The default is to include them.
+include_merge = True
diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 0000000..8849094
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,18 @@
+* [ ] Tested with the latest Haystack release
+* [ ] Tested with the current Haystack master branch
+
+## Expected behaviour
+
+## Actual behaviour
+
+## Steps to reproduce the behaviour
+
+1.
+
+## Configuration
+
+* Operating system version:
+* Search engine version:
+* Python version:
+* Django version:
+* Haystack version:
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..657887c
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,3 @@
+# Hey, thanks for contributing to Haystack. Please review [the contributor guidelines](https://django-haystack.readthedocs.io/en/latest/contributing.html) and confirm that [the tests pass](https://django-haystack.readthedocs.io/en/latest/running_tests.html) with at least one search engine.
+
+# Once your pull request has been submitted, the full test suite will be executed on https://travis-ci.org/django-haystack/django-haystack/pull_requests. Pull requests with passing tests are far more likely to be reviewed and merged.
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aef937e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+.settings
+*.pyc
+.DS_Store
+_build
+.*.sw[po]
+*.egg-info
+dist
+build
+MANIFEST
+.tox
+env
+env3
+*.egg
+.coverage
+.idea
+
+test_haystack/solr_tests/server/solr-4.6.0.tgz
+test_haystack/solr_tests/server/solr4/
diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 0000000..f3f4843
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,4 @@
+[settings]
+line_length=110
+known_first_party=haystack
+default_section=THIRDPARTY
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5d62930
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,57 @@
+sudo: false
+language: python
+python:
+    - 2.7
+    - 3.4
+    - 3.5
+    - pypy
+
+cache:
+    apt: true
+    pip: true
+    directories:
+        - $HOME/download-cache
+
+addons:
+    apt_packages:
+        - binutils
+        - default-jdk
+        - gdal-bin
+        - libgdal1h
+        - libgeos-c1
+        - libproj-dev
+        - libxapian22
+        - python-xapian
+        - wajig
+
+before_install:
+    - mkdir -p $HOME/download-cache
+
+install:
+    - pip install requests "Django${DJANGO_VERSION}"
+    - python setup.py clean build install
+
+before_script:
+    - BACKGROUND_SOLR=true test_haystack/solr_tests/server/start-solr-test-server.sh
+
+script:
+    - python test_haystack/solr_tests/server/wait-for-solr
+    - python setup.py test
+
+env:
+    matrix:
+        - DJANGO_VERSION=">=1.8,<1.9"
+        - DJANGO_VERSION=">=1.9,<1.10"
+        - DJANGO_VERSION="==1.10a1"
+
+matrix:
+    allow_failures:
+        - env: DJANGO_VERSION="==1.10a1"
+        - python: 'pypy'
+
+services:
+    - elasticsearch
+
+notifications:
+    irc: "irc.freenode.org#haystack"
+    email: false
diff --git a/docs/build/_sources/contributing.txt b/CONTRIBUTING.md
similarity index 52%
rename from docs/build/_sources/contributing.txt
rename to CONTRIBUTING.md
index 7806c19..f8f9451 100644
--- a/docs/build/_sources/contributing.txt
+++ b/CONTRIBUTING.md
@@ -1,4 +1,3 @@
-============
 Contributing
 ============
 
@@ -7,13 +6,11 @@ due to the community. Below are some guidelines on how to help with the project.
 
 
 Philosophy
-==========
+----------
 
 * Haystack is BSD-licensed. All contributed code must be either
-
   * the original work of the author, contributed under the BSD, or...
   * work taken from another project released under a BSD-compatible license.
-
 * GPL'd (or similar) works are not eligible for inclusion.
 * Haystack's git master branch should always be stable, production-ready &
   passing all tests.
@@ -27,7 +24,7 @@ Philosophy
 
 
 Guidelines For Reporting An Issue/Feature
-=========================================
+-----------------------------------------
 
 So you've found a bug or have a great idea for a feature. Here's the steps you
 should take to help get it added/fixed in Haystack:
@@ -36,28 +33,30 @@ should take to help get it added/fixed in Haystack:
   bug/feature. All issues are at https://github.com/toastdriven/django-haystack/issues
   and pull reqs are at https://github.com/toastdriven/django-haystack/pulls.
 * If there isn't one there, please file an issue. The ideal report includes:
-
-  * A description of the problem/suggestion.
-  * How to recreate the bug.
-  * If relevant, including the versions of your:
-
-    * Python interpreter
-    * Django
-    * Haystack
-    * Search engine used (as well as bindings)
-    * Optionally of the other dependencies involved
-
-  * Ideally, creating a pull request with a (failing) test case demonstrating
-    what's wrong. This makes it easy for us to reproduce & fix the problem.
-    Instructions for running the tests are at :doc:`index`
-
-You might also hop into the IRC channel (``#haystack`` on ``irc.freenode.net``)
+    * A description of the problem/suggestion.
+    * How to recreate the bug.
+    * If relevant, including the versions of your:
+        * Python interpreter
+        * Django
+        * Haystack
+        * Search engine used (as well as bindings)
+        * Optionally of the other dependencies involved
+* Ideally, creating a pull request with a (failing) test case demonstrating
+  what's wrong. This makes it easy for us to reproduce & fix the problem.
+
+  Github has a great guide for writing an effective pull request:
+  https://github.com/blog/1943-how-to-write-the-perfect-pull-request
+
+  Instructions for running the tests are at
+  https://django-haystack.readthedocs.io/en/latest/running_tests.html
+
+You might also hop into the IRC channel (`#haystack` on `irc.freenode.net`)
 & raise your question there, as there may be someone who can help you with a
 work-around.
 
 
 Guidelines For Contributing Code
-================================
+--------------------------------
 
 If you're ready to take the plunge & contribute back some code/docs, the
 process should look like:
@@ -76,57 +75,17 @@ process should look like:
 In order to be merged into Haystack, contributions must have the following:
 
 * A solid patch that:
-
-  * is clear.
-  * works across all supported versions of Python/Django.
-  * follows the existing style of the code base (mostly PEP-8).
-  * comments included as needed.
-
+    * is clear.
+    * works across all supported versions of Python/Django.
+    * follows the existing style of the code base (mostly PEP-8).
+    * comments included as needed to explain why the code functions as it does
 * A test case that demonstrates the previous flaw that now passes
   with the included patch.
 * If it adds/changes a public API, it must also include documentation
   for those changes.
-* Must be appropriately licensed (see "Philosophy").
+* Must be appropriately licensed (see [Philosophy](#philosophy)).
 * Adds yourself to the AUTHORS file.
 
 If your contribution lacks any of these things, they will have to be added
 by a core contributor before being merged into Haystack proper, which may take
 substantial time for the all-volunteer team to get to.
-
-
-Guidelines For Core Contributors
-================================
-
-If you've been granted the commit bit, here's how to shepherd the changes in:
-
-* Any time you go to work on Haystack, please use ``git pull --rebase`` to fetch
-  the latest changes.
-* Any new features/bug fixes must meet the above guidelines for contributing
-  code (solid patch/tests passing/docs included).
-* Commits are typically cherry-picked onto a branch off master.
-
-  * This is done so as not to include extraneous commits, as some people submit
-    pull reqs based on their git master that has other things applied to it.
-
-* A set of commits should be squashed down to a single commit.
-
-  * ``git merge --squash`` is a good tool for performing this, as is
-    ``git rebase -i HEAD~N``.
-  * This is done to prevent anyone using the git repo from accidently pulling
-    work-in-progress commits.
-
-* Commit messages should use past tense, describe what changed & thank anyone
-  involved. Examples::
-
-    """Added support for the latest version of Whoosh (v2.3.2)."""
-    """Fixed a bug in ``solr_backend.py``. Thanks to joeschmoe for the report!"""
-    """BACKWARD-INCOMPATIBLE: Altered the arguments passed to ``SearchBackend``.
-
-    Further description appears here if the change warrants an explanation
-    as to why it was done."""
-
-* For any patches applied from a contributor, please ensure their name appears
-  in the AUTHORS file.
-* When closing issues or pull requests, please reference the SHA in the closing
-  message (i.e. ``Thanks! Fixed in SHA: 6b93f6``). GitHub will automatically
-  link to it.
diff --git a/PKG-INFO b/PKG-INFO
deleted file mode 100644
index b30e456..0000000
--- a/PKG-INFO
+++ /dev/null
@@ -1,82 +0,0 @@
-Metadata-Version: 1.1
-Name: django-haystack
-Version: 2.5.dev2
-Summary: Pluggable search for Django.
-Home-page: http://haystacksearch.org/
-Author: Daniel Lindsley
-Author-email: daniel at toastdriven.com
-License: UNKNOWN
-Description: ========
-        Haystack
-        ========
-        
-        :author: Daniel Lindsley
-        :date: 2013/07/28
-        
-        Haystack provides modular search for Django. It features a unified, familiar
-        API that allows you to plug in different search backends (such as Solr_,
-        Elasticsearch_, Whoosh_, Xapian_, etc.) without having to modify your code.
-        
-        .. _Solr: http://lucene.apache.org/solr/
-        .. _Elasticsearch: http://elasticsearch.org/
-        .. _Whoosh: https://bitbucket.org/mchaput/whoosh/
-        .. _Xapian: http://xapian.org/
-        
-        Haystack is BSD licensed, plays nicely with third-party app without needing to
-        modify the source and supports advanced features like faceting, More Like This,
-        highlighting, spatial search and spelling suggestions.
-        
-        You can find more information at http://haystacksearch.org/.
-        
-        
-        Getting Help
-        ============
-        
-        There is a mailing list (http://groups.google.com/group/django-haystack/)
-        available for general discussion and an IRC channel (#haystack on
-        irc.freenode.net).
-        
-        
-        Documentation
-        =============
-        
-        * Development version: http://docs.haystacksearch.org/
-        * v2.4.X: https://django-haystack.readthedocs.io/en/v2.4.1/
-        * v2.3.X: https://django-haystack.readthedocs.io/en/v2.3.0/
-        * v2.2.X: https://django-haystack.readthedocs.io/en/v2.2.0/
-        * v2.1.X: https://django-haystack.readthedocs.io/en/v2.1.0/
-        * v2.0.X: https://django-haystack.readthedocs.io/en/v2.0.0/
-        * v1.2.X: https://django-haystack.readthedocs.io/en/v1.2.7/
-        * v1.1.X: https://django-haystack.readthedocs.io/en/v1.1/
-        
-        See the `changelog <docs/changelog.rst>`_
-        
-        Build Status
-        ============
-        
-        .. image:: https://travis-ci.org/django-haystack/django-haystack.svg?branch=master
-           :target: https://travis-ci.org/django-haystack/django-haystack
-        
-        Requirements
-        ============
-        
-        Haystack has a relatively easily-met set of requirements.
-        
-        * Python 2.7+ or Python 3.3+
-        * A supported version of Django: https://www.djangoproject.com/download/#supported-versions
-        
-        Additionally, each backend has its own requirements. You should refer to
-        https://django-haystack.readthedocs.io/en/latest/installing_search_engines.html for more
-        details.
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Utilities
diff --git a/django_haystack.egg-info/PKG-INFO b/django_haystack.egg-info/PKG-INFO
deleted file mode 100644
index b30e456..0000000
--- a/django_haystack.egg-info/PKG-INFO
+++ /dev/null
@@ -1,82 +0,0 @@
-Metadata-Version: 1.1
-Name: django-haystack
-Version: 2.5.dev2
-Summary: Pluggable search for Django.
-Home-page: http://haystacksearch.org/
-Author: Daniel Lindsley
-Author-email: daniel at toastdriven.com
-License: UNKNOWN
-Description: ========
-        Haystack
-        ========
-        
-        :author: Daniel Lindsley
-        :date: 2013/07/28
-        
-        Haystack provides modular search for Django. It features a unified, familiar
-        API that allows you to plug in different search backends (such as Solr_,
-        Elasticsearch_, Whoosh_, Xapian_, etc.) without having to modify your code.
-        
-        .. _Solr: http://lucene.apache.org/solr/
-        .. _Elasticsearch: http://elasticsearch.org/
-        .. _Whoosh: https://bitbucket.org/mchaput/whoosh/
-        .. _Xapian: http://xapian.org/
-        
-        Haystack is BSD licensed, plays nicely with third-party app without needing to
-        modify the source and supports advanced features like faceting, More Like This,
-        highlighting, spatial search and spelling suggestions.
-        
-        You can find more information at http://haystacksearch.org/.
-        
-        
-        Getting Help
-        ============
-        
-        There is a mailing list (http://groups.google.com/group/django-haystack/)
-        available for general discussion and an IRC channel (#haystack on
-        irc.freenode.net).
-        
-        
-        Documentation
-        =============
-        
-        * Development version: http://docs.haystacksearch.org/
-        * v2.4.X: https://django-haystack.readthedocs.io/en/v2.4.1/
-        * v2.3.X: https://django-haystack.readthedocs.io/en/v2.3.0/
-        * v2.2.X: https://django-haystack.readthedocs.io/en/v2.2.0/
-        * v2.1.X: https://django-haystack.readthedocs.io/en/v2.1.0/
-        * v2.0.X: https://django-haystack.readthedocs.io/en/v2.0.0/
-        * v1.2.X: https://django-haystack.readthedocs.io/en/v1.2.7/
-        * v1.1.X: https://django-haystack.readthedocs.io/en/v1.1/
-        
-        See the `changelog <docs/changelog.rst>`_
-        
-        Build Status
-        ============
-        
-        .. image:: https://travis-ci.org/django-haystack/django-haystack.svg?branch=master
-           :target: https://travis-ci.org/django-haystack/django-haystack
-        
-        Requirements
-        ============
-        
-        Haystack has a relatively easily-met set of requirements.
-        
-        * Python 2.7+ or Python 3.3+
-        * A supported version of Django: https://www.djangoproject.com/download/#supported-versions
-        
-        Additionally, each backend has its own requirements. You should refer to
-        https://django-haystack.readthedocs.io/en/latest/installing_search_engines.html for more
-        details.
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Utilities
diff --git a/django_haystack.egg-info/SOURCES.txt b/django_haystack.egg-info/SOURCES.txt
deleted file mode 100644
index 6372327..0000000
--- a/django_haystack.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,244 +0,0 @@
-AUTHORS
-LICENSE
-MANIFEST.in
-README.rst
-setup.cfg
-setup.py
-django_haystack.egg-info/PKG-INFO
-django_haystack.egg-info/SOURCES.txt
-django_haystack.egg-info/dependency_links.txt
-django_haystack.egg-info/not-zip-safe
-django_haystack.egg-info/pbr.json
-django_haystack.egg-info/requires.txt
-django_haystack.egg-info/top_level.txt
-docs/Makefile
-docs/admin.rst
-docs/architecture_overview.rst
-docs/autocomplete.rst
-docs/backend_support.rst
-docs/best_practices.rst
-docs/boost.rst
-docs/changelog.rst
-docs/conf.py
-docs/contributing.rst
-docs/creating_new_backends.rst
-docs/debugging.rst
-docs/faceting.rst
-docs/faq.rst
-docs/glossary.rst
-docs/highlighting.rst
-docs/index.rst
-docs/inputtypes.rst
-docs/installing_search_engines.rst
-docs/management_commands.rst
-docs/migration_from_1_to_2.rst
-docs/multiple_index.rst
-docs/other_apps.rst
-docs/python3.rst
-docs/rich_content_extraction.rst
-docs/running_tests.rst
-docs/searchbackend_api.rst
-docs/searchfield_api.rst
-docs/searchindex_api.rst
-docs/searchquery_api.rst
-docs/searchqueryset_api.rst
-docs/searchresult_api.rst
-docs/settings.rst
-docs/signal_processors.rst
-docs/spatial.rst
-docs/templatetags.rst
-docs/toc.rst
-docs/tutorial.rst
-docs/utils.rst
-docs/views_and_forms.rst
-docs/who_uses.rst
-docs/_build/.gitignore
-docs/_static/.gitignore
-docs/_templates/.gitignore
-docs/build/.buildinfo
-docs/build/admin.html
-docs/build/architecture_overview.html
-docs/build/autocomplete.html
-docs/build/backend_support.html
-docs/build/best_practices.html
... 48134 lines suppressed ...

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



More information about the Python-modules-commits mailing list