[arch-commits] Commit in jupyterlab/trunk (PKGBUILD no-nbclassic.patch)

[Antonio Rojas]

    Date: Monday, April 4, 2022 @ 12:03:35
  Author: arojas
Revision: 1181267

Drop nbclassic dependency

Added:
  jupyterlab/trunk/no-nbclassic.patch
Modified:
  jupyterlab/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   21 ++++++++++++++++-----
 no-nbclassic.patch |   13 +++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-04 11:15:24 UTC (rev 1181266)
+++ PKGBUILD	2022-04-04 12:03:35 UTC (rev 1181267)
@@ -3,19 +3,25 @@
 pkgname=jupyterlab
 _pipname=jupyterlab
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc='JupyterLab computational environment'
 arch=(any)
 url='https://github.com/jupyterlab/jupyterlab'
 license=(custom)
 makedepends=(python-build python-installer)
-depends=(python-jupyterlab_server python-jupyter_packaging jupyter-nbclassic nodejs)
+depends=(python-jupyterlab_server python-jupyter_packaging jupyter-notebook-shim nodejs)
 optdepends=('npm: to install extensions' 'jupyterlab-widgets: ipywidgets support')
-source=(https://pypi.io/packages/source/${_pipname:0:1}/$_pipname/$_pipname-$pkgver.tar.gz)
-sha256sums=('3c716bf5592cb28c5c55c615c6e5bd3efc71898f6957d13719b56478bbbb587a')
+checkdepends=('python-pytest-tornasync' 'npm')
+source=(https://pypi.io/packages/source/${_pipname:0:1}/$_pipname/$_pipname-$pkgver.tar.gz
+        no-nbclassic.patch
+        jupyterlab-fix-tests.patch::https://github.com/jupyterlab/jupyterlab/commit/56b437fc.patch)
+sha256sums=('3c716bf5592cb28c5c55c615c6e5bd3efc71898f6957d13719b56478bbbb587a'
+            '923954cca5ac139091f3a6c7c922c3bf3b4173375bb28a1cc016f74f82869d7e'
+            '5db8f09ecb71ca93c09d050940c9767218bf4ffc5368225eb7ebd72a7f02ed90')
 
 prepare() {
-  sed -e 's|nbclassic~=0.2|nbclassic|' -i $pkgname-$pkgver/setup.cfg # Remove dependency version constraint
+  patch -d $pkgname-$pkgver -p1 < no-nbclassic.patch # Drop nbclassic dependency
+  patch -d $pkgname-$pkgver -p1 < jupyterlab-fix-tests.patch # Fix tests
 }
 
 build() {
@@ -23,6 +29,11 @@
   python -m build --wheel --no-isolation
 }
 
+check() {
+  cd $pkgname-$pkgver
+  pytest -v -k 'not test_build'
+}
+
 package() {
   cd $pkgname-$pkgver
   python -m installer --destdir="$pkgdir" dist/*.whl

Added: no-nbclassic.patch
===================================================================
--- no-nbclassic.patch	                        (rev 0)
+++ no-nbclassic.patch	2022-04-04 12:03:35 UTC (rev 1181267)
@@ -0,0 +1,13 @@
+diff --git a/jupyterlab/labapp.py b/jupyterlab/labapp.py
+index 75af58179c..df2bcdc4cd 100644
+--- a/jupyterlab/labapp.py
++++ b/jupyterlab/labapp.py
+@@ -14,7 +14,7 @@ from jupyter_server.serverapp import flags
+ from jupyter_server.utils import url_path_join as ujoin
+ 
+ from jupyterlab_server import LabServerApp, LicensesApp, WorkspaceExportApp, WorkspaceImportApp, WorkspaceListApp
+-from nbclassic.shim import NBClassicConfigShimMixin
++from notebook_shim.shim import NotebookConfigShimMixin as NBClassicConfigShimMixin
+ from traitlets import Bool, Instance, Unicode, default
+ 
+ from ._version import __version__