Skip to content

Update vendored jquery - #11768

Closed
dstansby wants to merge 2 commits into
matplotlib:masterfrom
dstansby:jquery
Closed

dstansby wants to merge 2 commits into
matplotlib:masterfrom
dstansby:jquery

Conversation

@dstansby

Copy link
Copy Markdown
Member

Simple fix for #11199, whilst #11246 is being discussed.

@dstansby dstansby added this to the v2.2.3 milestone Jul 24, 2018

@anntzer anntzer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

That basically defeats the point mentioned in #11199 (comment), repeated here for convenience:

Right now jquery weights 1.3Mb; compare this with the baseline test images that weight ~50Kb each and that we are painstakingly trying to avoid adding to the repo.

@dstansby

Copy link
Copy Markdown
Member Author

Fair point, just to see what happens I've updated to the latest 1.x version in a way that should be a diff and not a file replace. I suspect the diff is still too large though.

@tacaswell

Copy link
Copy Markdown
Member

This missing a number of places the names need to be changed:

15:35 $ ack 'jquery-1.11'
examples/user_interfaces/embedding_webagg_sgskip.py
61:    <script src="_static/jquery/js/jquery-1.11.3.min.js"></script>

doc/api/api_changes.rst
1814:   +    <script src="_static/jquery/js/jquery-1.11.3.min.js"></script>

lib/matplotlib.egg-info/SOURCES.txt
1221:lib/matplotlib/backends/web_backend/jquery/js/jquery-1.11.3.js
1222:lib/matplotlib/backends/web_backend/jquery/js/jquery-1.11.3.min.js

lib/matplotlib/backends/web_backend/single_figure.html
7:    <script src="{{ prefix }}/_static/jquery/js/jquery-1.11.3.min.js"></script>

lib/matplotlib/backends/web_backend/all_figures.html
7:    <script src="{{ prefix }}/_static/jquery/js/jquery-1.11.3.min.js"></script>

On the call we decided to go with this (despite the concerns about size) for expediency and trusting git's compression.

@tacaswell

Copy link
Copy Markdown
Member

We should also verify that this actually fixes the CVEs against jquery.

@efiring

efiring commented Jul 30, 2018

Copy link
Copy Markdown
Member

I favor keeping the part of this PR that switches to using the unversioned name.

@tacaswell

Copy link
Copy Markdown
Member

We also need to update jquery-ui as that is what the CVE in #11199 is actually against.

@anntzer

anntzer commented Jul 30, 2018

Copy link
Copy Markdown
Contributor

Does this need to be urgently fixed? The CVE has been opened for more than 1y now, I don't see why this would have become urgent all of a sudden.
I can make #11246 work (as I said it's mostly there...), just not right now due to other priorities.

@tacaswell tacaswell modified the milestones: v2.2.3, v2.2.4 Aug 5, 2018
@jklymak jklymak mentioned this pull request Sep 28, 2018
6 tasks
@dstansby dstansby mentioned this pull request Oct 14, 2018
@dstansby

Copy link
Copy Markdown
Member Author

Yeah, replacing jquery-ui too makes this a bit of a large diff..

@tacaswell

Copy link
Copy Markdown
Member

Closing in favor of #11246

@tacaswell tacaswell closed this Feb 11, 2019
@QuLogic QuLogic removed this from the v2.2.4 milestone Feb 11, 2019
@dstansby
dstansby deleted the jquery branch February 11, 2019 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants