diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-05-03 10:44:38 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-05-03 13:14:52 +0100 |
| commit | 25923e84c44965c5ebdac0567133d5a88885015e (patch) | |
| tree | da8027496bbe382770c08dbf0143678f677f76c2 | |
| parent | 224012fb6557c775513d8719af6e9129717db791 (diff) | |
| download | dbus-python-25923e84c44965c5ebdac0567133d5a88885015e.tar.gz | |
Travis-CI: Install sphinx from PyPI
The one in Ubuntu 14.04 is too old for "python -m sphinx", and we
weren't installing it at all for non-system Pythons.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 73e02d2..e39651d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,6 @@ install: ${dbus_ci_system_python%-dbg}-docutils ${dbus_ci_system_python%-dbg}-gi ${dbus_ci_system_python%-dbg}-setuptools - ${dbus_ci_system_python%-dbg}-sphinx - > test "${dbus_ci_system_python%-dbg}" = "${dbus_ci_system_python}" || sudo apt-get -qq -y install @@ -58,9 +57,9 @@ install: http://deb.debian.org/debian/pool/main/a/autoconf-archive/autoconf-archive_20160916-1_all.deb - 'sudo dpkg -i autoconf-archive_*_all.deb' - 'rm autoconf-archive_*_all.deb' - - test -n "$dbus_ci_system_python" || pip install sphinx_rtd_theme tap.py + - test -n "$dbus_ci_system_python" || pip install sphinx sphinx_rtd_theme tap.py - test -z "$dbus_ci_system_python" || deactivate - - test -z "$dbus_ci_system_python" || pip install --user sphinx_rtd_theme tap.py + - test -z "$dbus_ci_system_python" || pip install --user sphinx sphinx_rtd_theme tap.py python: - "3.5" - "3.5-dev" |