Merge branch 'system-python-packages' into HEAD

mkoeppe · Aug 31, 2023 · 4da25a6 · 4da25a6
2 parents 8f576bc + 0ea6aa3
commit 4da25a6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/build/pkgs/jinja2/install-requires.txt b/build/pkgs/jinja2/install-requires.txt
@@ -1 +1,2 @@
-jinja2 >=2.11.2
+jinja2 >=3.0
+# for sphinx
diff --git a/build/pkgs/jupyter_jsmol/SPKG.rst b/build/pkgs/jupyter_jsmol/SPKG.rst
@@ -9,7 +9,7 @@ JSmol viewer widget for Jupyter
 License
 -------
 
-BSD
+MIT
 
 Upstream Contact
 ----------------

diff --git a/build/pkgs/jupyter_jsmol/checksums.ini b/build/pkgs/jupyter_jsmol/checksums.ini
@@ -1,5 +1,5 @@
-tarball=jupyter_jsmol-VERSION.tar.gz
-sha1=6ba59de9d1df15b2a09a57f6bdf10f48f13af9ac
-md5=90e9490414e7fbecc6013b4b051b06d7
-cksum=917919116
-upstream_url=https://pypi.io/packages/source/j/jupyter-jsmol/jupyter_jsmol-VERSION.tar.gz
+tarball=jupyter_jsmol-VERSION-py2.py3-none-any.whl
+sha1=b00f1ca76aaa906c7c0a43e36baf608183f3d552
+md5=dd786877513296a36a08518ad64ace47
+cksum=2135042898
+upstream_url=https://pypi.io/packages/py2.py3/j/jupyter_jsmol/jupyter_jsmol-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/jupyter_jsmol/dependencies b/build/pkgs/jupyter_jsmol/dependencies
@@ -1,4 +1,4 @@
-ipywidgets jupyter_packaging  | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ipywidgets | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_jsmol/install-requires.txt b/build/pkgs/jupyter_jsmol/install-requires.txt
@@ -1 +1 @@
-jupyter-jsmol >=2022.1.0
+jupyter-jsmol
diff --git a/build/pkgs/jupyter_jsmol/spkg-install.in b/build/pkgs/jupyter_jsmol/spkg-install.in
diff --git a/build/pkgs/packaging/install-requires.txt b/build/pkgs/packaging/install-requires.txt
@@ -1,2 +1,3 @@
-packaging >=18.0
+packaging >=21.0
 # Trac #30975: packaging 20.5 is known to work but we have to silence "DeprecationWarning: Creating a LegacyVersion"
+# Sphinx needs >= 21