From 0ae8076e55c694eaa5f031f298b829e8d337a411 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Fri, 13 Sep 2019 14:12:44 +0200 Subject: [PATCH] Install extra packages allways Do not make extra package installing dependent on TRAVIS_PYTHON_VERSION. Instead, install them if they are available (silently ignore errors about missing packages). --- .travis/config.sh | 5 ++--- .travis/preinstall | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis/config.sh b/.travis/config.sh index 228c8ac..5394e86 100644 --- a/.travis/config.sh +++ b/.travis/config.sh @@ -1,10 +1,9 @@ # SPDX-License-Identifier: MIT export LSR_MOLECULE_DEPS='-rmolecule_requirements.txt' +LSR_EXTRA_PACKAGES='python3-selinux' + case "${TRAVIS_PYTHON_VERSION}" in - 3.5) - LSR_EXTRA_PACKAGES='python3-selinux' - ;; 3.6|"") # Set these also if we are running locally: export LSR_TEXTRA_DEPS='PyYAML' diff --git a/.travis/preinstall b/.travis/preinstall index cad62cf..2c5e821 100755 --- a/.travis/preinstall +++ b/.travis/preinstall @@ -12,5 +12,5 @@ fi if [[ "${LSR_EXTRA_PACKAGES}" ]]; then sudo apt-get update - sudo apt-get install -y ${LSR_EXTRA_PACKAGES} + sudo apt-get install -y ${LSR_EXTRA_PACKAGES} || : fi