From 5141bc388f6834f68da8eb09bced2aa7c4641e83 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 4 Feb 2021 19:59:44 -0800 Subject: [PATCH] build/pkgs/widgetsnbextension: Patch out dependency on notebook (backport from widgetsnbextension-4) --- build/pkgs/widgetsnbextension/dependencies | 2 +- .../widgetsnbextension/package-version.txt | 2 +- .../patches/no-notebook-dep.patch | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 build/pkgs/widgetsnbextension/patches/no-notebook-dep.patch diff --git a/build/pkgs/widgetsnbextension/dependencies b/build/pkgs/widgetsnbextension/dependencies index f5b9be8f947..816ef654fc7 100644 --- a/build/pkgs/widgetsnbextension/dependencies +++ b/build/pkgs/widgetsnbextension/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) notebook jupyter_core +$(PYTHON) | $(PYTHON_TOOLCHAIN) jupyter_core ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/widgetsnbextension/package-version.txt b/build/pkgs/widgetsnbextension/package-version.txt index d5c0c991428..ffe309035c5 100644 --- a/build/pkgs/widgetsnbextension/package-version.txt +++ b/build/pkgs/widgetsnbextension/package-version.txt @@ -1 +1 @@ -3.5.1 +3.5.1.p0 diff --git a/build/pkgs/widgetsnbextension/patches/no-notebook-dep.patch b/build/pkgs/widgetsnbextension/patches/no-notebook-dep.patch new file mode 100644 index 00000000000..976091637f5 --- /dev/null +++ b/build/pkgs/widgetsnbextension/patches/no-notebook-dep.patch @@ -0,0 +1,24 @@ +commit 55bc3c93bf4310d4f4d9d02f2e51d1d65b7f6533 (HEAD -> 7.6.3-sage) +Author: Sylvain Corlay +Date: Mon Oct 21 01:33:23 2019 +0200 + + Drop notebook dependency from widgetsnbextension + +diff --git a/widgetsnbextension/setup.py b/widgetsnbextension/setup.py +index 866d82eb..88746f95 100644 +--- a/setup.py ++++ b/setup.py +@@ -219,13 +219,5 @@ if 'setuptools' in sys.modules: + from setuptools.command.develop import develop + setup_args['cmdclass']['develop'] = js_prerelease(develop, strict=True) + +-setuptools_args = {} +-install_requires = setuptools_args['install_requires'] = [ +- 'notebook>=4.4.1', +-] +- +-if 'setuptools' in sys.modules: +- setup_args.update(setuptools_args) +- + if __name__ == '__main__': + setup(**setup_args)