Skip to content

Commit 11380c0

Browse files
author
Cosimo Streppone
committed
Merge branch 'master' of github.com:django-haystack/pysolr into delete-multiple-ids
2 parents 282f6db + bb4748a commit 11380c0

22 files changed

+2448
-418
lines changed

.gitchangelog.rc

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
##
2+
## Format
3+
##
4+
## ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
5+
##
6+
## Description
7+
##
8+
## ACTION is one of 'chg', 'fix', 'new'
9+
##
10+
## Is WHAT the change is about.
11+
##
12+
## 'chg' is for refactor, small improvement, cosmetic changes...
13+
## 'fix' is for bug fixes
14+
## 'new' is for new features, big improvement
15+
##
16+
## AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
17+
##
18+
## Is WHO is concerned by the change.
19+
##
20+
## 'dev' is for developpers (API changes, refactors...)
21+
## 'usr' is for final users (UI changes)
22+
## 'pkg' is for packagers (packaging changes)
23+
## 'test' is for testers (test only related changes)
24+
## 'doc' is for doc guys (doc only changes)
25+
##
26+
## COMMIT_MSG is ... well ... the commit message itself.
27+
##
28+
## TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
29+
##
30+
## They are preceded with a '!' or a '@' (prefer the former, as the
31+
## latter is wrongly interpreted in github.) Commonly used tags are:
32+
##
33+
## 'refactor' is obviously for refactoring code only
34+
## 'minor' is for a very meaningless change (a typo, adding a comment)
35+
## 'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
36+
## 'wip' is for partial functionality but complete subfunctionality.
37+
##
38+
## Example:
39+
##
40+
## new: usr: support of bazaar implemented
41+
## chg: re-indentend some lines !cosmetic
42+
## new: dev: updated code to be compatible with last version of killer lib.
43+
## fix: pkg: updated year of licence coverage.
44+
## new: test: added a bunch of test around user usability of feature X.
45+
## fix: typo in spelling my name in comment. !minor
46+
##
47+
## Please note that multi-line commit message are supported, and only the
48+
## first line will be considered as the "summary" of the commit message. So
49+
## tags, and other rules only applies to the summary. The body of the commit
50+
## message will be displayed in the changelog without reformatting.
51+
52+
53+
##
54+
## ``ignore_regexps`` is a line of regexps
55+
##
56+
## Any commit having its full commit message matching any regexp listed here
57+
## will be ignored and won't be reported in the changelog.
58+
##
59+
ignore_regexps = [
60+
r'@minor', r'!minor',
61+
r'@cosmetic', r'!cosmetic',
62+
r'@refactor', r'!refactor',
63+
r'@wip', r'!wip',
64+
r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
65+
r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
66+
r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
67+
]
68+
69+
70+
## ``section_regexps`` is a list of 2-tuples associating a string label and a
71+
## list of regexp
72+
##
73+
## Commit messages will be classified in sections thanks to this. Section
74+
## titles are the label, and a commit is classified under this section if any
75+
## of the regexps associated is matching.
76+
##
77+
section_regexps = [
78+
('New', [
79+
r'^[nN]ew\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
80+
]),
81+
('Changes', [
82+
r'^[cC]hg\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
83+
]),
84+
('Fix', [
85+
r'^[fF]ix\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
86+
]),
87+
88+
('Other', None ## Match all lines
89+
),
90+
91+
]
92+
93+
94+
## ``body_process`` is a callable
95+
##
96+
## This callable will be given the original body and result will
97+
## be used in the changelog.
98+
##
99+
## Available constructs are:
100+
##
101+
## - any python callable that take one txt argument and return txt argument.
102+
##
103+
## - ReSub(pattern, replacement): will apply regexp substitution.
104+
##
105+
## - Indent(chars=" "): will indent the text with the prefix
106+
## Please remember that template engines gets also to modify the text and
107+
## will usually indent themselves the text if needed.
108+
##
109+
## - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
110+
##
111+
## - noop: do nothing
112+
##
113+
## - ucfirst: ensure the first letter is uppercase.
114+
## (usually used in the ``subject_process`` pipeline)
115+
##
116+
## - final_dot: ensure text finishes with a dot
117+
## (usually used in the ``subject_process`` pipeline)
118+
##
119+
## - strip: remove any spaces before or after the content of the string
120+
##
121+
## Additionally, you can `pipe` the provided filters, for instance:
122+
#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars=" ")
123+
#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
124+
#body_process = noop
125+
body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
126+
127+
128+
## ``subject_process`` is a callable
129+
##
130+
## This callable will be given the original subject and result will
131+
## be used in the changelog.
132+
##
133+
## Available constructs are those listed in ``body_process`` doc.
134+
subject_process = (strip |
135+
ReSub(r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n@]*)(@[a-z]+\s+)*$', r'\4') |
136+
ucfirst | final_dot)
137+
138+
139+
## ``tag_filter_regexp`` is a regexp
140+
##
141+
## Tags that will be used for the changelog must match this regexp.
142+
##
143+
tag_filter_regexp = r'^v[0-9]+\.[0-9]+(\.[0-9]+)?$'
144+
145+
146+
## ``unreleased_version_label`` is a string
147+
##
148+
## This label will be used as the changelog Title of the last set of changes
149+
## between last valid tag and HEAD if any.
150+
unreleased_version_label = "%%version%% (unreleased)"
151+
152+
153+
## ``output_engine`` is a callable
154+
##
155+
## This will change the output format of the generated changelog file
156+
##
157+
## Available choices are:
158+
##
159+
## - rest_py
160+
##
161+
## Legacy pure python engine, outputs ReSTructured text.
162+
## This is the default.
163+
##
164+
## - mustache(<template_name>)
165+
##
166+
## Template name could be any of the available templates in
167+
## ``templates/mustache/*.tpl``.
168+
## Requires python package ``pystache``.
169+
## Examples:
170+
## - mustache("markdown")
171+
## - mustache("restructuredtext")
172+
##
173+
## - makotemplate(<template_name>)
174+
##
175+
## Template name could be any of the available templates in
176+
## ``templates/mako/*.tpl``.
177+
## Requires python package ``mako``.
178+
## Examples:
179+
## - makotemplate("restructuredtext")
180+
##
181+
output_engine = rest_py
182+
#output_engine = mustache("restructuredtext")
183+
#output_engine = mustache("markdown")
184+
#output_engine = makotemplate("restructuredtext")
185+
186+
187+
## ``include_merge`` is a boolean
188+
##
189+
## This option tells git-log whether to include merge commits in the log.
190+
## The default is to include them.
191+
include_merge = True

.github/issue_template.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# I have
2+
* [ ] Tested with the latest release
3+
* [ ] Tested with the current master branch
4+
* [ ] Searched for similar existing issues
5+
6+
## Expected behaviour
7+
8+
## Actual behaviour
9+
10+
## Steps to reproduce the behaviour
11+
12+
1.
13+
14+
## Configuration
15+
16+
* Operating system version:
17+
* Search engine version:
18+
* Python version:
19+
* pysolr version:

.github/pull_request_template.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Hey, thanks for contributing to pysolr. Please confirm that [the tests pass](https://github.com/django-haystack/pysolr/blob/master/README.rst#running-tests) locally
2+
3+
# Once your pull request has been submitted, the full test suite will be executed on https://travis-ci.org/django-haystack/pysolr/pull_requests. Pull requests with passing tests are far more likely to be reviewed and merged.

.gitignore

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
*.pyc
2-
build
3-
dist/
4-
MANIFEST
5-
solr4
6-
env
7-
env3
8-
pysolr.egg-info/
91
.tox
102
solr*.tgz
3+
solr-app
4+
solr

.travis.yml

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
1+
sudo: false
12
language: python
23
python:
3-
- "2.7"
4+
- "2.7"
5+
- "3.3"
6+
- "3.4"
7+
- "3.5"
8+
- "pypy"
49

5-
before_install:
6-
- sudo apt-get update
7-
- sudo apt-get install default-jdk
8-
- pip install requests
10+
cache:
11+
apt: true
12+
pip: true
13+
directories:
14+
- $HOME/download-cache
915

10-
before_script:
11-
- python get-solr-download-url.py 4.7.2 | xargs curl -sSO
16+
env:
17+
- SOLRCLOUD=false
18+
- SOLRCLOUD=true
19+
20+
matrix:
21+
allow_failures:
22+
- python: 'pypy'
23+
24+
addons:
25+
apt_packages:
26+
- default-jdk
1227

1328
install:
14-
- pip install tox
29+
- "pip install 'requests>2'"
30+
- "pip install ."
31+
- 'if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then travis_retry pip install faulthandler; fi'
32+
- 'if [[ "${SOLRCLOUD:-false}" == "true" ]]; then pip install -e .[solrcloud]; fi'
1533

1634
script:
17-
- tox -e $TOX_ENV
18-
19-
env:
20-
- TOX_ENV=py26
21-
- TOX_ENV=py27
22-
- TOX_ENV=py33
23-
- TOX_ENV=py34
24-
- TOX_ENV=py26-tomcat
25-
- TOX_ENV=py27-tomcat
26-
- TOX_ENV=py33-tomcat
27-
- TOX_ENV=py34-tomcat
35+
- python run-tests.py
2836

2937
notifications:
30-
#irc: "irc.freenode.org#pysolr"
31-
email: false
38+
# irc: "irc.freenode.org#pysolr"
39+
email: false

AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ Contributors:
3232
* timsavage for a patch making add() compatible with generators
3333
* Karol Sikora (@sicarrots) for Solr 4 softCommit support
3434
* Çağatay Çallı (@faraday) for Solr 4 field update support
35+
* Emmanuel Leblond (@touilleMan) for fixing error handling on Python 3
36+
* Michał Jaworski (@swistakm) for improved Sentry-friendly logging
37+
* Upayavira (@upayavira) for SolrCloud support
38+
* Kwame Porter Robinson (@robinsonkwame) for adding overwrite support to Solr.add

0 commit comments

Comments
 (0)