Skip to content

Commit 707d820

Browse files
QuLogicQuLogic
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 7b7c62e commit 707d820

File tree

5 files changed

+1
-67
lines changed

5 files changed

+1
-67
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

‎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 & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@
2121
sys.exit(error)
2222

2323
from pathlib import Path
24-
import shutil
25-
from zipfile import ZipFile
2624

2725
from setuptools import setup, find_packages, Extension
2826
from setuptools.command.build_ext import build_ext as BuildExtCommand
29-
from setuptools.command.develop import develop as DevelopCommand
30-
from setuptools.command.install_lib import install_lib as InstallLibCommand
3127
from setuptools.command.test import test as TestCommand
3228

3329
# The setuptools version of sdist adds a setup.cfg file to the tree.
@@ -43,7 +39,7 @@
4339
from distutils.dist import Distribution
4440

4541
import setupext
46-
from setupext import print_raw, print_status, download_or_cache
42+
from setupext import print_raw, print_status
4743

4844
# Get the version from versioneer
4945
import versioneer
@@ -94,57 +90,6 @@ def build_extensions(self):
9490
cmdclass['build_ext'] = BuildExtraLibraries
9591

9692

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

0 commit comments

Comments
 (0)