Thanks to visit codestin.com
Credit goes to github.com

Skip to content

DOC: Fix CircleCI builds #14775

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

Jump to bottom
Merged
merged 3 commits into from
Jul 14, 2019
Merged

DOC: Fix CircleCI builds #14775

merged 3 commits into from
Jul 14, 2019

Conversation

alexrudy
Copy link
Contributor

@alexrudy alexrudy commented Jul 14, 2019 •
edited
Loading

PR Summary

CircleCI changed their linux distro. I had to do the following to get back to a good state:

For apt-get

  • libav-tools is now called ffmpeg
  • pgf is provided by texlive-pictures
  • otf-freefont is now fonts-freefont-otf

I also had to bump NumPy to 1.13 from 1.11 (1.11 doesn't build on Circle's Ubuntu any more). I spoke to
@rgommers at SciPy2019, and he recommended 1.13 because it supports python 3.6 & 3.7 and is the version of numpy that SciPy uses to build docs.

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

alexrudy added 3 commits July 14, 2019 09:34
@alexrudy
Rename libav-tools apt package to ffmpeg
d1722d3
@alexrudy
Fix some font packages
9f481d4
@alexrudy
Bumping numpy version used to build docs
b043075 
Rolf recommended 1.13 b/c that gives matplotlib a common version with Scipy and is the oldest version which supports 3.7
@alexrudy alexrudy changed the title Rename libav-tools apt package to ffmpeg DOC: Fix CircleCI builds Jul 14, 2019
timhoffm
timhoffm approved these changes Jul 14, 2019
View reviewed changes
Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working this out!

Bumping numpy to 1.13 is ok for CircleCI. This is only for the docs build. The general minimum requirement stays at 1.11 for now.

@tacaswell tacaswell modified the milestones: v3.1-doc, v2.2-doc Jul 14, 2019
@tacaswell tacaswell merged commit 16c1850 into matplotlib:master Jul 14, 2019
@tacaswell
Copy link
Member

Thanks @alexrudy !

@lumberbot-app
Copy link

lumberbot-app bot commented Jul 14, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v2.2.4-doc
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 16c1850cc2d454130199e57fb655b913fce24c46
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14775: DOC: Fix CircleCI builds'
  1. Push to a named branch :
git push YOURFORK v2.2.4-doc:auto-backport-of-pr-14775-on-v2.2.4-doc
  1. Create a PR against branch v2.2.4-doc, I would have named this PR:

"Backport PR #14775 on branch v2.2.4-doc"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@lumberbot-app
Copy link

lumberbot-app bot commented Jul 14, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v2.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 16c1850cc2d454130199e57fb655b913fce24c46
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14775: DOC: Fix CircleCI builds'
  1. Push to a named branch :
git push YOURFORK v2.2.x:auto-backport-of-pr-14775-on-v2.2.x
  1. Create a PR against branch v2.2.x, I would have named this PR:

"Backport PR #14775 on branch v2.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Jul 14, 2019
@tacaswell
Backport PR matplotlib#14775: DOC: Fix CircleCI builds
136d7e3
@meeseeksmachine meeseeksmachine mentioned this pull request Jul 14, 2019
Merged
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Jul 14, 2019
@tacaswell
Backport PR matplotlib#14775: DOC: Fix CircleCI builds
8d4cb8e
@meeseeksmachine meeseeksmachine mentioned this pull request Jul 14, 2019
Merged
@alexrudy alexrudy deleted the fix-circleci branch July 14, 2019 16:40
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Jul 14, 2019
@tacaswell
Backport PR matplotlib#14775: DOC: Fix CircleCI builds
bdc1af0 
also backport installing some extra fonts
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Jul 14, 2019
@tacaswell
Backport PR matplotlib#14775: DOC: Fix CircleCI builds
22731e9 
Merge pull request matplotlib#14775 from alexrudy/fix-circleci

DOC: Fix CircleCI builds
timhoffm added a commit that referenced this pull request Jul 14, 2019
@timhoffm
Merge pull request #14778 from meeseeksmachine/auto-backport-of-pr-14…
273c03a 
…775-on-v3.1.1-doc

Backport PR #14775 on branch v3.1.1-doc (DOC: Fix CircleCI builds)
@tacaswell tacaswell mentioned this pull request Jul 14, 2019
Merged
6 tasks
timhoffm added a commit that referenced this pull request Jul 14, 2019
@timhoffm
Merge pull request #14777 from meeseeksmachine/auto-backport-of-pr-14…
9a5473d 
…775-on-v3.1.x

Backport PR #14775 on branch v3.1.x (DOC: Fix CircleCI builds)
dstansby added a commit that referenced this pull request Jul 15, 2019
@dstansby
Merge pull request #14780 from tacaswell/auto-backport-of-pr-14775-on…
4b36511 
…-v2.2.4-doc

Backport PR #14775: DOC: Fix CircleCI builds
dstansby added a commit that referenced this pull request Jul 15, 2019
@dstansby
Merge pull request #14779 from tacaswell/auto-backport-of-pr-14775-on…
81e9ace 
…-v2.2.x

Backport PR #14775: DOC: Fix CircleCI builds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.2-doc
Development

Successfully merging this pull request may close these issues.
3 participants
@alexrudy @tacaswell @timhoffm