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

Skip to content

Commit 95fb244

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 6c1606f commit 95fb244

6 files changed

Lines changed: 1 addition & 128 deletions

File tree

.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 & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,9 @@
2626
from pathlib import Path
2727
import shutil
2828
import subprocess
29-
from zipfile import ZipFile
3029

3130
from setuptools import setup, find_packages, Extension
3231
from setuptools.command.build_ext import build_ext as BuildExtCommand
33-
from setuptools.command.develop import develop as DevelopCommand
34-
from setuptools.command.install_lib import install_lib as InstallLibCommand
3532
from setuptools.command.test import test as TestCommand
3633

3734
# The setuptools version of sdist adds a setup.cfg file to the tree.
@@ -48,7 +45,7 @@
4845
from distutils.dist import Distribution
4946

5047
import setupext
51-
from setupext import print_raw, print_status, download_or_cache
48+
from setupext import print_raw, print_status
5249

5350
# Get the version from versioneer
5451
import versioneer
@@ -182,58 +179,6 @@ def build_extensions(self):
182179
cmdclass['build_ext'] = BuildExtraLibraries
183180

184181

185-
def _download_jquery_to(dest):
186-
# Note: When bumping the jquery-ui version, also update the versions in
187-
# single_figure.html and all_figures.html.
188-
url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
189-
sha = "f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d"
190-
name = Path(url).stem
191-
if (dest / name).exists():
192-
return
193-
# If we are installing from an sdist, use the already downloaded jquery-ui.
194-
sdist_src = Path("lib/matplotlib/backends/web_backend", name)
195-
if sdist_src.exists():
196-
shutil.copytree(sdist_src, dest / name)
197-
return
198-
if not (dest / name).exists():
199-
dest.mkdir(parents=True, exist_ok=True)
200-
try:
201-
buff = download_or_cache(url, sha)
202-
except Exception:
203-
raise IOError(
204-
"Failed to download jquery-ui. Please download "
205-
"{url} and extract it to {dest}.".format(url=url, dest=dest))
206-
with ZipFile(buff) as zf:
207-
zf.extractall(dest)
208-
209-
210-
# Relying on versioneer's implementation detail.
211-
class sdist_with_jquery(cmdclass['sdist']):
212-
def make_release_tree(self, base_dir, files):
213-
super().make_release_tree(base_dir, files)
214-
_download_jquery_to(
215-
Path(base_dir, "lib/matplotlib/backends/web_backend/"))
216-
217-
218-
# Affects install and bdist_wheel.
219-
class install_lib_with_jquery(InstallLibCommand):
220-
def run(self):
221-
super().run()
222-
_download_jquery_to(
223-
Path(self.install_dir, "matplotlib/backends/web_backend/"))
224-
225-
226-
class develop_with_jquery(DevelopCommand):
227-
def run(self):
228-
super().run()
229-
_download_jquery_to(Path("lib/matplotlib/backends/web_backend/"))
230-
231-
232-
cmdclass['sdist'] = sdist_with_jquery
233-
cmdclass['install_lib'] = install_lib_with_jquery
234-
cmdclass['develop'] = develop_with_jquery
235-
236-
237182
package_data = {} # Will be filled below by the various components.
238183

239184
# If the user just queries for information, don't bother figuring out which

0 commit comments

Comments
 (0)