Try to fix Travis build

See PR cms-gem-daq-project#139
lmoureaux · Aug 13, 2018 · cbd8694 · cbd8694
1 parent 1fdebc0
commit cbd8694
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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 -Ur /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
@@ -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