8000 Fix issue with Sphinx 1.3.4 by jenshnielsen · Pull Request #5872 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix issue with Sphinx 1.3.4 #5872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 24, 2016
Merged

Fix issue with Sphinx 1.3.4 #5872

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
507079f
Install everyting but numpy and pandas from pypi
jenshnielsen Jan 17, 2016
81f795f
Unify install section of travis file
jenshnielsen Jan 17, 2016
bd08e4c
Cleanup Yaml syntax in script section:
jenshnielsen Jan 17, 2016
1d582bc
Cleanup Yaml syntax in after section:
jenshnielsen Jan 17, 2016
dbfbb3d
Upgrade pip before installing link checker
jenshnielsen Jan 17, 2016
7c9eeed
Split install into meaningfull sections
jenshnielsen Jan 17, 2016
0ccce1b
Convert docstring to numpy doc to work around sphinx issue
jenshnielsen Jan 17, 2016
7f37443
Remove :option: which seems to serve no purpose and raises a warning …
jenshnielsen Jan 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Unify install section of travis file
  • Loading branch information
@jenshnielsen
jenshnielsen committed Jan 19, 2016
commit 81f795f3ee2499478f2434808f8ec11ae8e0f083
32 changes: 15 additions & 17 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,31 +62,30 @@ before_install:
- export PATH=/usr/lib/ccache:$PATH

install:
- ccache -s
# Upgrade pip and setuptools. Mock has issues with the default version of
# setuptools
- |
ccache -s
# Upgrade pip and setuptools and wheel to get as clean an install as possible
pip install --upgrade pip
pip install --upgrade wheel
pip install --upgrade setuptools
# Install only from travis wheelhouse
- if [ -z "$PRE" ]; then
# Install only from travis wheelhouse
if [ -z "$PRE" ]; then
wheelhouse_pip_install $NUMPY $PANDAS;
else
pip install $PRE $NUMPY $PANDAS;
fi
# Always install from pypi
- pip install $PRE pep8 cycler coveralls coverage python-dateutil pyparsing!=2.0.4 pillow sphinx!=1.3.0 $MOCK
- 'pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose'
# Always install from pypi
pip install $PRE pep8 cycler coveralls coverage python-dateutil pyparsing!=2.0.4
pip install pillow sphinx!=1.3.0 $MOCK numpydoc ipython colorspacious
# Install nose from a build which has partial
# support for python36 and suport for coverage output suppressing
pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose

# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
# version since is it basically just a .ttf file
# The current Travis Ubuntu image is to old to search .local/share/fonts so we store fonts in .fonts

- |
# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
# version since is it basically just a .ttf file
# The current Travis U 6B81 buntu image is to old to search .local/share/fonts so we store fonts in .fonts
if [[ $BUILD_DOCS == true ]]; then
pip install $PRE numpydoc ipython colorspacious
wget https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O Felipa-Regular.ttf
wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb
mkdir -p tmp
Expand All @@ -99,8 +98,7 @@ install:
# Use the special local version of freetype for testing
cp ci/travis/setup.cfg .
fi;

- pip install -e .
pip install -e .

script:
# The number of processes is hardcoded, because using too many causes the
Expand Down
0