Skip to content

Commit ae97712

Browse files
committed
Remove debugging; cleanup; xapian working for 3.11-dev at least.
Nightly is still failing on a macro expansion. The compiler chokes on the result. Disable xapian build for nightly. Fixing nightly is for another night....
1 parent 88d80ba commit ae97712

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.travis.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,12 @@ before_install:
6868
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python --disable-documentation; fi
6969
# edit the configure script. distutils.sysconfig.get_config_vars('SO')
7070
# doesn't work for 3.11 or newer.
71-
# Change distutils.sysconfig... to just sysconfig to get valid SO.
72-
- python3 -V
73-
- if [[ $TRAVIS_PYTHON_VERSION == "3."* ]]; then sed -i -e '/PYTHON3_SO=/s/distutils\.//g' -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure; grep PYTHON3_SO configure; ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; fi
74-
- if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then sed -i -e '/PYTHON3_SO=/s/distutils\.//g' -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure; grep PYTHON3_SO configure; ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; fi
71+
# Change distutils.sysconfig... to just sysconfig and SO to EXT_SUFFIX
72+
# to get valid value.
73+
- if [[ $TRAVIS_PYTHON_VERSION == "3."* ]]; then sed -i -e '/PYTHON3_SO=/s/distutils\.//g' -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure; ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; fi
74+
- if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then sed -i -e '/PYTHON3_SO=/s/distutils\.//g' -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure; ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; fi
7575
- if [[ $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then sed -i -e '/PYTHON3_SO=/s/distutils\.//g' -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure; ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; fi
76-
- python3 -c 'import sysconfig; s=sysconfig.get_config_var("EXT_SUFFIX"); print(s) if s else exit(1)'
77-
# - case "$TRAVIS_PYTHON_VERSION" in nightly|3.11-dev) echo skipping xapian build;; *) make && make install; esac
78-
- make && make install
76+
- case "$TRAVIS_PYTHON_VERSION" in nightly) echo skipping xapian build;; *) make && make install; esac
7977

8078
- PATH=$VIRTUAL_ENV/bin:$PATH
8179

0 commit comments

Comments
 (0)