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

Skip to content

Commit 9141f1a

Browse files
committed
Remove jQuery and jQuery UI.
It's now unused, except specfically in the IPython inline figure HTML, but we know it's available there.
1 parent f8eaa3b commit 9141f1a

File tree

6 files changed

+1
-129
lines changed

6 files changed

+1
-129
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,5 @@ lib/z.lib
102102

103103
# Vendored dependencies #
104104
#########################
105-
106-
jquery-ui-*/
107105
lib/matplotlib/backends/web_backend/node_modules/
108106
lib/matplotlib/backends/web_backend/package-lock.json

LICENSE/LICENSE_JQUERY

Lines changed: 0 additions & 61 deletions
This file was deleted.

examples/user_interfaces/embedding_webagg_sgskip.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ def create_figure():
6060
type="text/css" />
6161
<link rel="stylesheet" href="_static/css/fbm.css" type="text/css" />
6262
<link rel="stylesheet" href="_static/css/mpl.css" type="text/css">
63-
<link rel="stylesheet" href="_static/jquery-ui-1.12.1/jquery-ui.min.css" />
64-
<script src="_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
65-
<script src="_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
6663
<script src="mpl.js"></script>
6764
6865
<script>

lib/matplotlib/backends/web_backend/all_figures.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
55
<link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
66
<link rel="stylesheet" href="{{ prefix }}/_static/css/mpl.css" type="text/css">
7-
<link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
8-
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
9-
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
107
<script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
118
<script src="{{ prefix }}/js/mpl.js"></script>
129

lib/matplotlib/backends/web_backend/single_figure.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
55
<link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
66
<link rel="stylesheet" href="{{ prefix }}/_static/css/mpl.css" type="text/css">
7-
<link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
8-
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
9-
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
107
<script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
118
<script src="{{ prefix }}/js/mpl.js"></script>
129
<script>

setup.py

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@
2323
sys.exit(error)
2424

2525
from pathlib import Path
26-
import shutil
27-
from zipfile import ZipFile
2826

2927
from setuptools import setup, find_packages, Extension
3028
from setuptools.command.build_ext import build_ext as BuildExtCommand
31-
from setuptools.command.develop import develop as DevelopCommand
32-
from setuptools.command.install_lib import install_lib as InstallLibCommand
3329
from setuptools.command.test import test as TestCommand
3430

3531
# The setuptools version of sdist adds a setup.cfg file to the tree.
@@ -45,7 +41,7 @@
4541
from distutils.dist import Distribution
4642

4743
import setupext
48-
from setupext import print_raw, print_status, download_or_cache
44+
from setupext import print_raw, print_status
4945

5046
# Get the version from versioneer
5147
import versioneer
@@ -96,58 +92,6 @@ def build_extensions(self):
9692
cmdclass['build_ext'] = BuildExtraLibraries
9793

9894

99-
def _download_jquery_to(dest):
100-
# Note: When bumping the jquery-ui version, also update the versions in
101-
# single_figure.html and all_figures.html.
102-
url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
103-
sha = "f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d"
104-
name = Path(url).stem
105-
if (dest / name).exists():
106-
return
107-
# If we are installing from an sdist, use the already downloaded jquery-ui.
108-
sdist_src = Path("lib/matplotlib/backends/web_backend", name)
109-
if sdist_src.exists():
110-
shutil.copytree(sdist_src, dest / name)
111-
return
112-
if not (dest / name).exists():
113-
dest.mkdir(parents=True, exist_ok=True)
114-
try:
115-
buff = download_or_cache(url, sha)
116-
except Exception:
117-
raise IOError(
118-
"Failed to download jquery-ui. Please download "
119-
"{url} and extract it to {dest}.".format(url=url, dest=dest))
120-
with ZipFile(buff) as zf:
121-
zf.extractall(dest)
122-
123-
124-
# Relying on versioneer's implementation detail.
125-
class sdist_with_jquery(cmdclass['sdist']):
126-
def make_release_tree(self, base_dir, files):
127-
super().make_release_tree(base_dir, files)
128-
_download_jquery_to(
129-
Path(base_dir, "lib/matplotlib/backends/web_backend/"))
130-
131-
132-
# Affects install and bdist_wheel.
133-
class install_lib_with_jquery(InstallLibCommand):
134-
def run(self):
135-
super().run()
136-
_download_jquery_to(
137-
Path(self.install_dir, "matplotlib/backends/web_backend/"))
138-
139-
140-
class develop_with_jquery(DevelopCommand):
141-
def run(self):
142-
super().run()
143-
_download_jquery_to(Path("lib/matplotlib/backends/web_backend/"))
144-
145-
146-
cmdclass['sdist'] = sdist_with_jquery
147-
cmdclass['install_lib'] = install_lib_with_jquery
148-
cmdclass['develop'] = develop_with_jquery
149-
150-
15195
# One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
15296
# however, this is needed on Windows to avoid creating infinite subprocesses
15397
# when using multiprocessing.

0 commit comments

Comments
 (0)