Skip to content

Manual backport of #11246 #13445

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 7 commits into from
Feb 17, 2019
Merged

Manual backport of #11246 #13445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9d56d4
Merge pull request #11246 from anntzer/download-jquery
tacaswell Feb 16, 2019
3d26f43
MNT: setuptools objects do not inherit from object in py27
tacaswell Feb 16, 2019
e6b585c
MNT: urlopen is not a context manager on py2
tacaswell Feb 16, 2019
5d1f672
MNT: Now unpack the tallball directly on download
tacaswell Feb 16, 2019
ed60030
MNT: remove unused import
tacaswell Feb 16, 2019
8559f04
MNT: also adjust win build for pre-extracted freetype
tacaswell Feb 16, 2019
4de6dfb
FIX: logic bug that never tries the second mirror for freetype
tacaswell Feb 17, 2019
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,8 @@ lib/z.lib
#################

.ipynb_checkpoints/

# Vendored dependencies #
#########################

jquery-ui-*/
6 changes: 3 additions & 3 deletions examples/user_interfaces/embedding_webagg_sgskip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ def create_figure():
<link rel="stylesheet" href="_static/css/page.css" type="text/css">
<link rel="stylesheet" href="_static/css/boilerplate.css" type="text/css" />
<link rel="stylesheet" href="_static/css/fbm.css" type="text/css" />
<link rel="stylesheet" href="_static/jquery/css/themes/base/jquery-ui.min.css" >
<script src="_static/jquery/js/jquery-1.11.3.min.js"></script>
<script src="_static/jquery/js/jquery-ui.min.js"></script>
<link rel="stylesheet" href="_static/jquery-ui-1.12.1/jquery-ui.min.css" >
<script src="_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
<script src="_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
<script src="mpl.js"></script>

<script>
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/web_backend/all_figures.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
<link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
<link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
<link rel="stylesheet" href="{{ prefix }}/_static/jquery/css/themes/base/jquery-ui.min.css" >
<script src="{{ prefix }}/_static/jquery/js/jquery-1.11.3.min.js"></script>
<script src="{{ prefix }}/_static/jquery/js/jquery-ui.min.js"></script>
<link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
<script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
<script src="{{ prefix }}/js/mpl.js"></script>

Expand Down
Binary file removed ...backend/jquery/css/themes/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...backend/jquery/css/themes/base/images/ui-bg_diagonals-thick_20_666666_40x40.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...kends/web_backend/jquery/css/themes/base/images/ui-bg_flat_10_000000_40x100.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ends/web_backend/jquery/css/themes/base/images/ui-bg_glass_100_f6f6f6_1x400.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ends/web_backend/jquery/css/themes/base/images/ui-bg_glass_100_fdf5ce_1x400.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...kends/web_backend/jquery/css/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...eb_backend/jquery/css/themes/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...backend/jquery/css/themes/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
View file
Open in desktop
Binary file not shown.
Binary file removed ..._backend/jquery/css/themes/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../backends/web_backend/jquery/css/themes/base/images/ui-icons_222222_256x240.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../backends/web_backend/jquery/css/themes/base/images/ui-icons_228ef1_256x240.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../backends/web_backend/jquery/css/themes/base/images/ui-icons_ef8c08_256x240.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../backends/web_backend/jquery/css/themes/base/images/ui-icons_ffd27a_256x240.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../backends/web_backend/jquery/css/themes/base/images/ui-icons_ffffff_256x240.png
View file
Open in desktop
Binary file not shown.
Loading