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
Split install into meaningfull sections
  • Loading branch information
@jenshnielsen
jenshnielsen committed Jan 19, 2016
commit 7c9eeed667dd336a88893e9014fc7fca586b219b
19 changes: 13 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,28 @@ matrix:
- python: "nightly"

before_install:
- source ci/travis/travis_tools.sh
# Install into our own pristine virtualenv
- virtualenv --python=python venv
- source venv/bin/activate
- export PATH=/usr/lib/ccache:$PATH
- |
# Install into our own pristine virtualenv
source ci/travis/travis_tools.sh
virtualenv --python=python venv
source venv/bin/activate
export PATH=/usr/lib/ccache:$PATH

install:
- |
# Setup environment
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
- |
# Install dependencies
if [ -z "$PRE" ]; then
# Install only from travis wheelhouse
wheelhouse_pip_install $NUMPY $PANDAS;
else
# Fall back to pypi for non suported python versions
pip install $PRE $NUMPY $PANDAS;
fi
# Always install from pypi
Expand All @@ -98,6 +103,8 @@ install:
# Use the special local version of freetype for testing
cp ci/travis/setup.cfg .
fi;
- |
# Install matplotlib
pip install -e .

script:
Expand Down
0