Skip to content

Commit 9b44c54

Browse files
committed
Try using OS python xapian rather than building.
1 parent f99039a commit 9b44c54

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

.travis.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,34 @@ addons:
4444
# - sourceline: ppa:xapian-backports/ppa
4545

4646
packages:
47-
# Required to build/install the xapian-binding
48-
- libxapian-dev
49-
# Required to install gpg
47+
# # Required to build/install the xapian-binding
48+
# - libxapian-dev
49+
# # Required to install gpg
5050
- swig
5151
# Required to build gpgme.
5252
- gpgsm
5353

5454
before_install:
55-
- echo "$TRAVIS_PYTHON_VERSION"
56-
# Sphinx required to build the xapian python bindings. Use 1.8.5 on
57-
# older python and newest on newer.
58-
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
59-
- if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
60-
- if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then pip install sphinx; fi
61-
- sudo apt-get update && sudo apt-get upgrade libxapian-dev libxapian
62-
- XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER
63-
- cd /tmp
64-
- curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
65-
- tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
66-
- cd xapian-bindings-$XAPIAN_VER/
67-
- echo $TRAVIS_PYTHON_VERSION
68-
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python; fi
69-
- if [[ $TRAVIS_PYTHON_VERSION == "3."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
70-
- if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
71-
- if [[ $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
72-
- make && make install
55+
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then apt-get install python-xapian; else apt-get install python3-xapian
56+
57+
# - echo "$TRAVIS_PYTHON_VERSION"
58+
# # Sphinx required to build the xapian python bindings. Use 1.8.5 on
59+
# # older python and newest on newer.
60+
# - if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
61+
# - if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
62+
# - if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then pip install sphinx; fi
63+
# - sudo apt-get update && sudo apt-get upgrade libxapian-dev libxapian
64+
# - XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER
65+
# - cd /tmp
66+
# - curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
67+
# - tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
68+
# - cd xapian-bindings-$XAPIAN_VER/
69+
# - echo $TRAVIS_PYTHON_VERSION
70+
# - if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python; fi
71+
# - if [[ $TRAVIS_PYTHON_VERSION == "3."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
72+
# - if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
73+
# - if [[ $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
74+
# - make && make install
7375

7476
- PATH=$VIRTUAL_ENV/bin:$PATH
7577

0 commit comments

Comments
 (0)