10000 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
Cleanup Yaml syntax in script section:
  • Loading branch information
@jenshnielsen
jenshnielsen committed Jan 19, 2016
commit bd08e4c972aeec05d3cdb18dc51620c7a2a380a5
24 changes: 12 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ script:
# The number of processes is hardcoded, because using too many causes the
# Travis VM to run out of memory (since so many copies of inkscape and
# ghostscript are running at the same time).
- echo Testing using $NPROC processes
- echo The following args are passed to nose $NOSE_ARGS
- |
echo Testing using $NPROC processes
echo The following args are passed to nose $NOSE_ARGS
if [[ $BUILD_DOCS == false ]]; then
export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples
gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS
Expand All @@ -122,16 +122,16 @@ script:
fi

after_failure:
|
if [[ $BUILD_DOCS == false && $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'matplotlib/matplotlib' ]]; then
gem install travis-artifacts
cd $TRAVIS_BUILD_DIR/../tmp_test_dir
tar cjf result_images.tar.bz2 result_images
travis-artifacts upload --path result_images.tar.bz2
echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2
else
echo "The result images will only be uploaded if they are on the matplotlib/matplotlib repo - this is for security reasons to prevent arbitrary PRs echoing security details."
fi
- |
if [[ $BUILD_DOCS == false && $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'matplotlib/matplotlib' ]]; then
gem install travis-artifacts
cd $TRAVIS_BUILD_DIR/../tmp_test_dir
tar cjf result_images.tar.bz2 result_images
travis-artifacts upload --path result_images.tar.bz2
echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2
else
echo "The result images will only be uploaded if they are on the matplotlib/matplotlib repo - this is for security reasons to prevent arbitrary PRs echoing security details."
fi

after_success:
|
Expand Down
0