matthias/xapian-haystack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Travis build and added Xapian 1.4.1 to it.

Browse Source
This commit is contained in:
Jorge C. Leitão 2016-10-27 15:46:06 +01:00
parent e0e6a11e46
commit 313ef57a55
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

@ -4,23 +4,35 @@ language: python
matrix: matrix:
include: include:
- python: 3.4 - python: 3.4
env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3 env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.4.1
- python: 3.4
env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.4.1
- python: 3.4
env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.4.1
- python: 3.4
env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3
- python: 3.4 - python: 3.4
env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3 env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3
- python: 3.4 - python: 3.4
env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3
- python: 2.7
env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3 env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3
- python: 2.7
env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.4.1
- python: 2.7
env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.4.1
- python: 2.7
env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.4.1
- python: 2.7
env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3
- python: 2.7 - python: 2.7
env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3 env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3
- python: 2.7 - python: 2.7
env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3 env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3
- python: 2.7 - python: 2.7
env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.2.19 env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.2.24
- python: 2.7 - python: 2.7
env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.2.19 env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.2.24
- python: 2.7 - python: 2.7
env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.2.19 env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.2.24
addons: addons:
apt: apt:

6
README.rst
View File

@ -40,12 +40,12 @@ Requirements
- Django-Haystack 2 - Django-Haystack 2
- Xapian 1.2.19+ - Xapian 1.2.19+
In particular, we build this backend on `Travis`_ using: In particular, we build-test this backend in `Travis`_ using:
- Python 2.7 and 3.3 - Python 2.7 and 3.4
- Django 1.8, 1.9 and 1.10 - Django 1.8, 1.9 and 1.10
- Django-Haystack (master) - Django-Haystack (master)
- Xapian 1.2.19 (in Python 2) and 1.3.3 (in both) - Xapian 1.2.19 (Python 2 only), 1.3.3 (both), and 1.4.1 (both)
Installation Installation

6
install_xapian.sh
View File

@ -37,12 +37,18 @@ else
XAPIAN_CONFIG= XAPIAN_CONFIG=
fi fi
# The bindings for Python require python-sphinx
echo "Installing Python-Sphinx..."
pip install sphinx
echo "Installing Xapian-bindings..." echo "Installing Xapian-bindings..."
cd $VIRTUAL_ENV/packages/${BINDINGS} cd $VIRTUAL_ENV/packages/${BINDINGS}
./configure --prefix=$VIRTUAL_ENV $PYTHON_FLAG XAPIAN_CONFIG=$XAPIAN_CONFIG && make && make install ./configure --prefix=$VIRTUAL_ENV $PYTHON_FLAG XAPIAN_CONFIG=$XAPIAN_CONFIG && make && make install
# clean # clean
cd $VIRTUAL_ENV
rm -rf $VIRTUAL_ENV/packages rm -rf $VIRTUAL_ENV/packages
# test # test
echo "Testing Xapian..."
python -c "import xapian" python -c "import xapian"