summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-07-13 13:14:21 +0200
committerIlya Etingof <etingof@gmail.com>2019-07-13 13:14:21 +0200
commitbc6cc03491480afe90663fed9b56e07537980022 (patch)
treeca0d3687f160bbee066f2c1c3cd5eb91f4b93368
parent5a5e096520d6ee42b99abaa724e16a48c10f261d (diff)
downloadpyasn1-git-bc6cc03491480afe90663fed9b56e07537980022.tar.gz
Fix Travis docs build on Python 3.4+
-rw-r--r--.travis.yml9
-rw-r--r--devel-requirements.txt1
2 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 0b7ad76..cb495de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,14 @@ install:
- pip install -e .
script:
- PYTHONPATH=.:$PYTHONPATH python tests/__main__.py
- - make -C docs html
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then (make -C docs html); fi
+ - if [[ $TRAVIS_PYTHON_VERSION == 'nightly' ]]; then (make -C docs html); fi
after_success:
- PYTHONPATH=.:$PYTHONPATH coverage run --omit=*test* tests/__main__.py
- codecov
diff --git a/devel-requirements.txt b/devel-requirements.txt
index 45da368..f960024 100644
--- a/devel-requirements.txt
+++ b/devel-requirements.txt
@@ -1 +1,2 @@
sphinx<1.5; python_version < '3.4'
+sphinx; python_version >= '3.4'