Skip to content

BLD: only try to get freetype src if src does not exist #13455

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.

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 1 commit into from
Feb 18, 2019

Conversation

tacaswell
Copy link
Member

Closes #13450 (again)

PR Summary

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

@tacaswell tacaswell added this to the v2.2.4 milestone Feb 17, 2019
@tacaswell
Copy link
Member Author

Third time's the charm?

tgz.extractall("build")
# do we need to download / load the source from cache?
if not os.path.exists(src_path):
if not os.path.exists('build'):
Copy link
Contributor

Choose a reason for hiding this comment

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

this belongs out of the main if? (if the source tree exists but not the buildddir, you still want to mkdir build)

Copy link
Member Author

Choose a reason for hiding this comment

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

The src path is in build (see L954) so if we have the source dir, build exists.

@anntzer anntzer added the Build label Feb 18, 2019
@timhoffm timhoffm merged commit 3306021 into matplotlib:master Feb 18, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Feb 18, 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 33060219903462b0b057b9628da342c544d1b501
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13455: BLD: only try to get freetype src if src does not exist'
  1. Push to a named branch :
git push YOURFORK v2.2.x:auto-backport-of-pr-13455-on-v2.2.x
  1. Create a PR against branch v2.2.x, I would have named this PR:

"Backport PR #13455 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 Feb 18, 2019
@tacaswell tacaswell deleted the fix_freetype_download_logic branch February 18, 2019 19:43
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Feb 18, 2019
…oad_logic

BLD: only try to get freetype src if src does not exist
dstansby added a commit that referenced this pull request Feb 18, 2019
…455-on-v3.0.x

Backport PR #13455 on branch v3.0.x (BLD: only try to get freetype src if src does not exist)
NelleV added a commit that referenced this pull request Feb 19, 2019
…-v2.2.x

Merge pull request #13455 from tacaswell/fix_freetype_download_logic
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issues with jquery download caching
3 participants