Skip to content

Don't redownload jquery when installing from an sdist #14915

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 1 commit into from
Aug 5, 2019
Merged

Don't redownload jquery when installing from an sdist #14915

merged 1 commit into from
Aug 5, 2019

Conversation

AWhetter
Copy link
Contributor

Closes #14585

PR Summary

The source for jquery-ui is already made available as part of the sdist. This change avoids downloading jquery-ui at all if installing from the sdist and jquery-ui can be found locally.

The use case I have is we don't have access to the internet. We access matplotlib through a devpi mirror. Unfortunately our build system requires us to install from an sdist rather than a wheel.

Ideally this would be backported to the v2.2.x branch. Should I submit a separate pull request for that?

PR Checklist

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

@matplotlib matplotlib deleted a comment from LyLaKate Jul 29, 2019
@tacaswell tacaswell added this to the v2.2.5 milestone Aug 2, 2019
@tacaswell
Copy link
Member

Thanks @AWhetter !

@tacaswell tacaswell added the Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. label Aug 5, 2019
@tacaswell tacaswell merged commit b49ca9d into matplotlib:master Aug 5, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Aug 5, 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 b49ca9dd8a0a6cf1bda872ffe0c73025af1f9bf2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #14915: Don't redownload jquery when installing from an sdist"
  1. Push to a named branch :
git push YOURFORK v2.2.x:auto-backport-of-pr-14915-on-v2.2.x
  1. Create a PR against branch v2.2.x, I would have named this PR:

"Backport PR #14915 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.

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 5, 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 v3.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 b49ca9dd8a0a6cf1bda872ffe0c73025af1f9bf2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #14915: Don't redownload jquery when installing from an sdist"
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14915-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #14915 on branch v3.1.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.

tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Aug 5, 2019
@tacaswell
Merge pull request matplotlib#14915 from AWhetter/fix_14585
83f931d 
BLD: Don't redownload jquery when installing from an sdist
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Aug 5, 2019
@tacaswell
Merge pull request matplotlib#14915 from AWhetter/fix_14585
44eabe3 
BLD: Don't redownload jquery when installing from an sdist
@tacaswell
Copy link
Member

The conflicts on both branches were with import order so fortunately super easy to resolve!

@anntzer anntzer added the Build label Aug 5, 2019
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Aug 5, 2019
@tacaswell
Merge pull request matplotlib#14915 from AWhetter/fix_14585
2ea3a0b 
BLD: Don't redownload jquery when installing from an sdist
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Aug 7, 2019
@tacaswell
Merge pull request matplotlib#14915 from AWhetter/fix_14585
8d27eeb 
BLD: Don't redownload jquery when installing from an sdist
tacaswell added a commit that referenced this pull request Aug 7, 2019
@tacaswell
Merge pull request #14987 from tacaswell/auto-backport-of-pr-14915-on…
d11ab35 
…-v3.1.x

BLD: use jquery in sdist when installing from sdist

Merge pull request #14915 from AWhetter/fix_14585
tacaswell added a commit that referenced this pull request Aug 7, 2019
@tacaswell
Merge pull request #14986 from tacaswell/auto-backport-of-pr-14915-on…
180a87c 
…-v2.2.x

BLD: use jquery in sdist when installing from sdist

Merge pull request #14915 from AWhetter/fix_14585
@tacaswell tacaswell mentioned this pull request Aug 27, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tacaswell tacaswell tacaswell approved these changes

@anntzer anntzer anntzer approved these changes

Assignees
No one assigned
Labels
Build Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Milestone
v2.2.5
Development

Successfully merging this pull request may close these issues.

Installing matplotlib from sources downloads jquery-ui anyway
3 participants
@AWhetter @tacaswell @anntzer