Change ipympl/pkgconfig/widgetsnbextension to wheel packages, drop build deps

build/pkgs/ipympl/checksums.ini

@@ -0,0 +1,5 @@
+tarball=ipympl-VERSION-py2.py3-none-any.whl
+sha1=9848409026669d9edd83074730d7e2456ae8a187
+md5=e08ec29d29955174178b7230d41a7ff7
+cksum=490103438
+upstream_url=https://pypi.io/packages/py2.py3/i/ipympl/ipympl-VERSION-py2.py3-none-any.whl

build/pkgs/ipympl/dependencies

@@ -1,6 +1,4 @@
- ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN)  jupyter_packaging $(PYTHON)
+ipython numpy ipython_genutils pillow traitlets ipywidgets matplotlib | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
-
-jupyterlab is listed as a "build-system requires", but the package installs correctly without it.

build/pkgs/ipympl/package-version.txt

@@ -0,0 +1 @@
+0.9.3

build/pkgs/pkgconfig/checksums.ini

@@ -1,5 +1,5 @@
-tarball=pkgconfig-VERSION.tar.gz
-sha1=32af6abc220c64b36f745a208b950542b1ab3456
-md5=12523e11b91b050ca49975cc033689a4
-cksum=1707388199
-upstream_url=https://pypi.io/packages/source/p/pkgconfig/pkgconfig-VERSION.tar.gz
+tarball=pkgconfig-VERSION-py3-none-any.whl
+sha1=bca14b2806a8e8afb0bd04f8e3675550b286dda8
+md5=80f1e06563f3af0f090694db58736455
+cksum=15738577
+upstream_url=https://pypi.io/packages/py3/p/pkgconfig/pkgconfig-VERSION-py3-none-any.whl

build/pkgs/pkgconfig/dependencies

@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) pkgconf poetry_core $(PYTHON)
+ | pkgconf $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/pkgconfig/install-requires.txt

@@ -1 +1 @@
-pkgconfig >=1.5.1
+pkgconfig

build/pkgs/widgetsnbextension/SPKG.rst

@@ -1,7 +1,18 @@
-widgetsnbextension: Jupyter notebook extension for interactive HTML widgets
-===========================================================================
+widgetsnbextension: Jupyter interactive widgets for Jupyter Notebook
+====================================================================
 
 Description
 -----------
 
-Interactive HTML widgets for Jupyter notebooks.
+Jupyter interactive widgets for Jupyter Notebook
+
+License
+-------
+
+BSD 3-Clause License
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/widgetsnbextension/
+

build/pkgs/widgetsnbextension/checksums.ini

@@ -1,5 +1,5 @@
-tarball=widgetsnbextension-VERSION.tar.gz
-sha1=21f8dc7732adad09921bf590fa0eb0d4c3dd7f48
-md5=2d44896382b3a587823e08df6d2f3165
-cksum=209268639
-upstream_url=https://pypi.io/packages/source/w/widgetsnbextension/widgetsnbextension-VERSION.tar.gz
+tarball=widgetsnbextension-VERSION-py3-none-any.whl
+sha1=1ffb84b17fca00a6e4bbad41f395ed6f37e1c6b9
+md5=38786a4166938b1b4165a76c244c3fc9
+cksum=2255132975
+upstream_url=https://pypi.io/packages/py3/w/widgetsnbextension/widgetsnbextension-VERSION-py3-none-any.whl

build/pkgs/widgetsnbextension/dependencies

@@ -1,4 +1,4 @@
- jupyter_packaging | $(PYTHON_TOOLCHAIN) jupyter_core $(PYTHON)
+jupyter_core | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/widgetsnbextension/install-requires.txt

@@ -1 +1 @@
-widgetsnbextension >=3.5.1
+widgetsnbextension

build/pkgs/widgetsnbextension/package-version.txt

@@ -1 +1 @@
-4.0.3
+4.0.8

configure.ac

@@ -507,21 +507,15 @@ AC_ARG_ENABLE([cvxopt],
 AC_ARG_ENABLE([notebook],
   AS_HELP_STRING([--disable-notebook],
                  [disable build of the Jupyter notebook and related packages]), [
-    for pkg in notebook nbconvert beautifulsoup4 sagenb_export nbformat nbclient terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol argon2_cffi webencodings tinycss2; do
-      AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
-    done
-  ])
-
-AS_IF([test "$SAGE_ENABLE_notebook" = no -a "$SAGE_ENABLE_sagelib" = no], [
-    for pkg in jupyter_client ipykernel ipython zeromq pyzmq; do
+    for pkg in notebook nbconvert beautifulsoup4 sagenb_export nbformat nbclient terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol argon2_cffi argon2_cffi_bindings webencodings tinycss2 ipympl soupsieve fastjsonschema; do
       AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
     done
   ])
 
 AC_ARG_ENABLE([r],
   AS_HELP_STRING([--disable-r],
                  [disable build of the R package and related packages]), [
-    for pkg in r rpy2 r_jupyter tzlocal; do
+    for pkg in r rpy2 r_jupyter tzlocal pytz_deprecation_shim; do
       AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
     done
   ])
@@ -530,7 +524,7 @@ AC_ARG_ENABLE([doc],
   AS_HELP_STRING([--disable-doc],
                  [disable build of the Sage documentation and packages depending on it]), [
     dnl Disable packages needed for docbuilding
-    for pkg in sage_docbuild alabaster babel snowballstemmer imagesize sphinx sphinxcontrib_devhelp sphinxcontrib_jsmath sphinxcontrib_serializinghtml sphinxcontrib_applehelp sphinxcontrib_htmlhelp sphinxcontrib_qthelp sphinxcontrib_websupport jupyter_sphinx furo sphinx_copybutton mathjax; do
+    for pkg in sage_docbuild alabaster babel snowballstemmer imagesize sphinx sphinxcontrib_devhelp sphinxcontrib_jsmath sphinxcontrib_serializinghtml sphinxcontrib_applehelp sphinxcontrib_htmlhelp sphinxcontrib_qthelp sphinxcontrib_websupport jupyter_sphinx furo sphinx_copybutton mathjax sphinx_basic_ng; do
       AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
     done
     AS_VAR_IF([enableval], [no], [dnl Disable the docbuild by disabling the install tree for documentation
@@ -546,6 +540,28 @@ AC_ARG_ENABLE([sagelib],
     done
   ])
 
+
+dnl Handle combinations of --disable-foo flags that may enable us to
+dnl prune even more dependencies.
+AS_IF([test "$SAGE_ENABLE_notebook" = no -a "$SAGE_ENABLE_sagelib" = no], [
+    for pkg in jupyter_client ipykernel ipython zeromq pyzmq; do
+      AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
+    done
+  ])
+AS_IF([test "$SAGE_ENABLE_r" = no -a "$SAGE_ENABLE_sage_docbuild" = no], [
+  dnl pytz is needed only by rpy2 and babel, and babel is already
+  dnl disabled by --disable-doc.
+  for pkg in pytz; do
+    AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
+  done
+])
+AS_IF([test "$SAGE_ENABLE_r" = no -a "$SAGE_ENABLE_notebook" = no], [
+  dnl These two are dependencies of both rpy2 and some notebook stuff
+  for pkg in cffi pycparser; do
+    AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
+  done
+])
+
 dnl Packages that require a special override to use the SPKG
 dnl when the system package is not usable.
 AS_VAR_SET([sage_use_system_gcc], [force])