From 6409f2590e7e83db4d9ca0162ed2043f6b115ba7 Mon Sep 17 00:00:00 2001 From: Louis Moureaux Date: Mon, 13 Aug 2018 18:57:22 +0200 Subject: [PATCH] Try to fix Travis build See PR #139 --- .travis.yml | 1 + requirements-dev.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a1f9eb6..517f9e35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,6 +101,7 @@ after_script: skip - gem install github_changelog_generator script: - echo 'Running build stage on docker container $DOCKER_CONTAINER_ID' + - docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -eic "sudo pip install -r /home/daqbuild/${REPO_NAME}/requirements-dev.txt" || travis_terminate 1 - docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -eic "cd /home/daqbuild/${REPO_NAME}; make" || travis_terminate 1 - docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -eic "cd /home/daqbuild/${REPO_NAME}; make rpm" || travis_terminate 1 - docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -eic "cd /home/daqbuild/${REPO_NAME}; rpm -q --filesbypkg -p rpm/*.rpm" diff --git a/requirements-dev.txt b/requirements-dev.txt index 2fe65be9..eeafcb0a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ importlib setuptools>25,<=38 pip>8,<10.1 -sphinx +sphinx==1.5; python_version == '2.6' +sphinx; python_version >= '2.7' sphinxcontrib-napoleon