Skip to content

Commit

Permalink
Merge pull request #252 from enthought/feature/add-sphinx-to-ci-depen…
Browse files Browse the repository at this point in the history
…dencies

Add Sphinx to the CI dependencies
  • Loading branch information
itziakos committed Jul 21, 2015
2 parents 4946df0 + 39dfd01 commit b617a3f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ install:
- if ! [[ $TRAVIS_PYTHON_VERSION > '2.6' ]]; then pip install unittest2 ; fi
- if [[ $TRAVIS_PYTHON_VERSION > '3.' ]]; then pip install numpy ; fi
- pip install --install-option="--no-cython-compile" cython
- pip install Sphinx
- pip install coverage
- pip install coveralls
- python setup.py develop
Expand Down
1 change: 1 addition & 0 deletions appveyor-install.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pip install --cache-dir c:/egg_cache nose
pip install --cache-dir c:/egg_cache coverage
pip install --cache-dir c:/egg_cache numpy
pip install --cache-dir c:/egg_cache cython
pip install --cache-dir C:/egg_cache Sphinx

rem install traits
python setup.py develop
6 changes: 6 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import re
import subprocess
import sys

from setuptools import setup, Extension, find_packages

Expand Down Expand Up @@ -105,6 +106,11 @@ def write_version_py(filename='traits/_version.py'):
)

def additional_commands():
# Pygments 2 isn't supported on Python 3 versions earlier than 3.3, so
# don't make the documentation command available there.
if (3,) <= sys.version_info < (3, 3):
return {}

try:
from sphinx.setup_command import BuildDoc
except ImportError:
Expand Down

0 comments on commit b617a3f

Please sign in to comment.