From 1a3c7dfd1d64c115e8da6f2b7ee283cd7faa11bb Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sat, 5 Mar 2022 13:52:21 -0800
Subject: [PATCH] build/pkgs/{jupyter_packaging,ipympl}: Reduce to pip packages

---
 build/pkgs/ipympl/checksums.ini                  | 5 -----
 build/pkgs/ipympl/dependencies                   | 4 +---
 build/pkgs/ipympl/package-version.txt            | 1 -
 build/pkgs/ipympl/requirements.txt               | 1 +
 build/pkgs/ipympl/spkg-install.in                | 2 --
 build/pkgs/jupyter_packaging/SPKG.rst            | 8 ++++----
 build/pkgs/jupyter_packaging/checksums.ini       | 5 -----
 build/pkgs/jupyter_packaging/dependencies        | 2 +-
 build/pkgs/jupyter_packaging/package-version.txt | 1 -
 build/pkgs/jupyter_packaging/requirements.txt    | 1 +
 build/pkgs/jupyter_packaging/spkg-install.in     | 2 --
 11 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 build/pkgs/ipympl/checksums.ini
 delete mode 100644 build/pkgs/ipympl/package-version.txt
 create mode 100644 build/pkgs/ipympl/requirements.txt
 delete mode 100644 build/pkgs/ipympl/spkg-install.in
 delete mode 100644 build/pkgs/jupyter_packaging/checksums.ini
 delete mode 100644 build/pkgs/jupyter_packaging/package-version.txt
 create mode 100644 build/pkgs/jupyter_packaging/requirements.txt
 delete mode 100644 build/pkgs/jupyter_packaging/spkg-install.in

diff --git a/build/pkgs/ipympl/checksums.ini b/build/pkgs/ipympl/checksums.ini
deleted file mode 100644
index d67f1362d12..00000000000
--- a/build/pkgs/ipympl/checksums.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-tarball=ipympl-VERSION.tar.gz
-sha1=6bccdb8c1801f1babfe0504fb21359f7a43fcbfc
-md5=7ee429dc01e92522b5b3c6131e31a7d3
-cksum=3626243657
-upstream_url=https://pypi.io/packages/source/i/ipympl/ipympl-VERSION.tar.gz
diff --git a/build/pkgs/ipympl/dependencies b/build/pkgs/ipympl/dependencies
index 56687b4dda0..0738c2d7777 100644
--- a/build/pkgs/ipympl/dependencies
+++ b/build/pkgs/ipympl/dependencies
@@ -1,6 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) ipywidgets matplotlib ipykernel jupyter_packaging $(findstring jupyterlab,$(OPTIONAL_INSTALLED_PACKAGES))
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
 
 ----------
 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.
diff --git a/build/pkgs/ipympl/package-version.txt b/build/pkgs/ipympl/package-version.txt
deleted file mode 100644
index 6201b5f77f5..00000000000
--- a/build/pkgs/ipympl/package-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.8.8
diff --git a/build/pkgs/ipympl/requirements.txt b/build/pkgs/ipympl/requirements.txt
new file mode 100644
index 00000000000..d715db054cd
--- /dev/null
+++ b/build/pkgs/ipympl/requirements.txt
@@ -0,0 +1 @@
+ipympl
diff --git a/build/pkgs/ipympl/spkg-install.in b/build/pkgs/ipympl/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/ipympl/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .
diff --git a/build/pkgs/jupyter_packaging/SPKG.rst b/build/pkgs/jupyter_packaging/SPKG.rst
index 7e6a0bcfd8a..95fabc9d40e 100644
--- a/build/pkgs/jupyter_packaging/SPKG.rst
+++ b/build/pkgs/jupyter_packaging/SPKG.rst
@@ -1,15 +1,15 @@
-jupyter_packaging: Jupyter Packaging Utilities
-==============================================
+jupyter_packaging: Jupyter Packaging Utilities.
+===============================================
 
 Description
 -----------
 
-Jupyter Packaging Utilities
+Jupyter Packaging Utilities.
 
 License
 -------
 
-BSD
+BSD 3-Clause License
 
 Upstream Contact
 ----------------
diff --git a/build/pkgs/jupyter_packaging/checksums.ini b/build/pkgs/jupyter_packaging/checksums.ini
deleted file mode 100644
index 2d0c8df95c0..00000000000
--- a/build/pkgs/jupyter_packaging/checksums.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-tarball=jupyter_packaging-VERSION.tar.gz
-sha1=298ad31fb2acd9fa3f34aff9e2ccc8ef5de1076a
-md5=6d39c1382acccdc5dd85ce5702c9ef8f
-cksum=372068937
-upstream_url=https://pypi.io/packages/source/j/jupyter_packaging/jupyter_packaging-VERSION.tar.gz
diff --git a/build/pkgs/jupyter_packaging/dependencies b/build/pkgs/jupyter_packaging/dependencies
index 91a41b84d7d..0738c2d7777 100644
--- a/build/pkgs/jupyter_packaging/dependencies
+++ b/build/pkgs/jupyter_packaging/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) packaging | $(PYTHON_TOOLCHAIN)
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_packaging/package-version.txt b/build/pkgs/jupyter_packaging/package-version.txt
deleted file mode 100644
index af88ba82486..00000000000
--- a/build/pkgs/jupyter_packaging/package-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.11.1
diff --git a/build/pkgs/jupyter_packaging/requirements.txt b/build/pkgs/jupyter_packaging/requirements.txt
new file mode 100644
index 00000000000..b5ec61b7d14
--- /dev/null
+++ b/build/pkgs/jupyter_packaging/requirements.txt
@@ -0,0 +1 @@
+jupyter-packaging
diff --git a/build/pkgs/jupyter_packaging/spkg-install.in b/build/pkgs/jupyter_packaging/spkg-install.in
deleted file mode 100644
index 37ac1a53437..00000000000
--- a/build/pkgs/jupyter_packaging/spkg-install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src
-sdh_pip_install .