Drop support for Django < 2.2 and add Django 3.2 support
This commit is contained in:
Claude Paroz
parent
90f5bc8c14
commit
a8566ca33b
38
.travis.yml
38
.travis.yml
|
|
@ -3,34 +3,30 @@ language: python
|
|||
|
||||
matrix:
|
||||
include:
|
||||
- python: 3.9
|
||||
env: DJANGO_VERSION=">=3.2,<4.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.9
|
||||
env: DJANGO_VERSION=">=3.1,<3.2" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.9
|
||||
env: DJANGO_VERSION=">=3.0,<3.1" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.9
|
||||
env: DJANGO_VERSION=">=2.2,<3.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.8
|
||||
env: DJANGO_VERSION=">=3.2,<4.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.8
|
||||
env: DJANGO_VERSION=">=3.1,<3.2" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.8
|
||||
env: DJANGO_VERSION=">=3.0,<3.1" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=3.2,<4.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=3.1,<3.2" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=3.0,<3.1" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=2.2,<3.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.7
|
||||
env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.6
|
||||
env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.6
|
||||
env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.6
|
||||
env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.5
|
||||
env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.5
|
||||
env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.5
|
||||
env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
|
||||
- python: 3.4
|
||||
env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.3.6
|
||||
- python: 3.4
|
||||
env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.3.6
|
||||
env: DJANGO_VERSION=">=2.2,<3.0" XAPIAN_VERSION=1.4.9
|
||||
|
||||
addons:
|
||||
apt:
|
||||
|
|
|
|||
29
README.rst
29
README.rst
|
|
@ -9,10 +9,10 @@ Xapian backend for Django-Haystack
|
|||
:target: https://coveralls.io/github/notanumber/xapian-haystack?branch=master
|
||||
|
||||
Xapian-haystack is a backend of `Django-Haystack <http://haystacksearch.org/>`__
|
||||
for the `Xapian <http://xapian.org>`__ search engine.
|
||||
for the `Xapian <https://xapian.org>`__ search engine.
|
||||
Thanks for checking it out.
|
||||
|
||||
You can find more information about Xapian `here <http://getting-started-with-xapian.readthedocs.org>`__.
|
||||
You can find more information about Xapian `here <https://getting-started-with-xapian.readthedocs.io>`__.
|
||||
|
||||
|
||||
Features
|
||||
|
|
@ -36,16 +36,9 @@ Requirements
|
|||
------------
|
||||
|
||||
- Python 3+
|
||||
- Django 1.11+
|
||||
- Django-Haystack 2.5.1
|
||||
- Xapian 1.3.3+
|
||||
|
||||
In particular, we build-test this backend in `Travis`_ using:
|
||||
|
||||
- Python 3.4
|
||||
- Django 1.11, 2.0, 2.1, 2.2
|
||||
- Django-Haystack (master)
|
||||
- Xapian 1.3.6 and 1.4.1
|
||||
- Django 2.2+
|
||||
- Django-Haystack 2.8.0
|
||||
- Xapian 1.4+
|
||||
|
||||
|
||||
Installation
|
||||
|
|
@ -57,11 +50,11 @@ First, install Xapian in your machine e.g. with the script provided,
|
|||
source <path>/bin/activate
|
||||
./install_xapian.sh <version>
|
||||
|
||||
`<version>` must be >=1.3.0. This takes around 10 minutes.
|
||||
`<version>` must be >=1.4.0. This takes around 10 minutes.
|
||||
|
||||
Finally, install Xapian-Haystack by running::
|
||||
|
||||
pip install git+https://github.com/notanumber/xapian-haystack.git
|
||||
pip install xapian-haystack
|
||||
|
||||
|
||||
Configuration
|
||||
|
|
@ -108,7 +101,7 @@ Xapian-Haystack has a test suite in continuous deployment in `Travis`_. The scri
|
|||
Source
|
||||
------
|
||||
|
||||
The source code can be found in `github <http://github.com/notanumber/xapian-haystack/>`_.
|
||||
The source code can be found in `github <https://github.com/notanumber/xapian-haystack/>`_.
|
||||
|
||||
|
||||
Credits
|
||||
|
|
@ -117,7 +110,7 @@ Credits
|
|||
Xapian-Haystack is maintained by `Jorge C. Leitão <http://jorgecarleitao.net>`__;
|
||||
`David Sauve <mailto:david.sauve@bag-of-holding.com>`__ was the main contributor of Xapian-Haystack and
|
||||
Xapian-Haystack was originally funded by `Trapeze <http://www.trapeze.com>`__.
|
||||
`Claude Paroz <http://www.2xlibre.net>`__ is a frequent contributor.
|
||||
`Claude Paroz <https://www.2xlibre.net>`__ is a frequent contributor.
|
||||
`ANtlord <https://github.com/ANtlord>`__ implemented support for EdgeNgram and Ngram.
|
||||
|
||||
|
||||
|
|
@ -132,8 +125,8 @@ It may be redistributed under the terms specified in the LICENSE file.
|
|||
Questions, Comments, Concerns:
|
||||
------------------------------
|
||||
|
||||
Feel free to open an issue `here <http://github.com/notanumber/xapian-haystack/issues>`__
|
||||
Feel free to open an issue `here <https://github.com/notanumber/xapian-haystack/issues>`__
|
||||
or pull request your work.
|
||||
|
||||
You can ask questions on the django-haystack `mailing list <http://groups.google.com/group/django-haystack/>`_:
|
||||
You can ask questions on the django-haystack `mailing list <https://groups.google.com/group/django-haystack/>`_:
|
||||
or in the irc ``#haystack``.
|
||||
|
|
|
|||
6
setup.py
6
setup.py
|
|
@ -7,7 +7,7 @@ def read(fname):
|
|||
|
||||
setup(
|
||||
name='xapian-haystack',
|
||||
version='2.1.0',
|
||||
version='3.0.0',
|
||||
description='A Xapian backend for Haystack',
|
||||
long_description=read('README.rst'),
|
||||
classifiers=[
|
||||
|
|
@ -24,7 +24,7 @@ setup(
|
|||
license='GPL2',
|
||||
py_modules=['xapian_backend'],
|
||||
install_requires=[
|
||||
'django>=1.11',
|
||||
'django-haystack>=2.5.1',
|
||||
'django>=2.2',
|
||||
'django-haystack>=2.8.0',
|
||||
]
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue