From 2f44b00bbdab3990f8e23118a2a5e01222c299ce Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 26 Oct 2022 17:37:09 +0200 Subject: [PATCH 1/2] Update to `jupyterlite==0.1.0b14` --- docs/environment.yml | 2 +- docs/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index c94c584694..8daa0c4e60 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -25,5 +25,5 @@ dependencies: - sphinx_rtd_theme - sympy - pip: - - jupyterlite==0.1.0b11 + - jupyterlite==0.1.0b14 - jupyterlite-sphinx~=0.7.2 diff --git a/docs/requirements.txt b/docs/requirements.txt index cb5480648b..6dea92f913 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -14,5 +14,5 @@ packaging scikit-image scikit-learn sympy -jupyterlite==0.1.0b11 +jupyterlite==0.1.0b14 jupyterlite-sphinx~=0.7.2 From ec2b8d8f0bdc989bdff15166fb24eaaaa742e269 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 26 Oct 2022 17:38:43 +0200 Subject: [PATCH 2/2] Use the `%pip` magic --- docs/source/examples/Beat Frequencies.ipynb | 6 +----- docs/source/examples/Controller.ipynb | 6 +----- docs/source/examples/Exploring Graphs.ipynb | 6 +----- docs/source/examples/Factoring.ipynb | 6 +----- docs/source/examples/Image Browser.ipynb | 6 +----- docs/source/examples/Image Processing.ipynb | 6 +----- docs/source/examples/Layout Example.ipynb | 6 +----- docs/source/examples/Layout Templates.ipynb | 6 +----- .../examples/Lorenz Differential Equations.ipynb | 6 +----- docs/source/examples/Media widgets.ipynb | 6 +----- docs/source/examples/Output Widget.ipynb | 6 +----- docs/source/examples/Using Interact.ipynb | 6 +----- docs/source/examples/Variable Inspector.ipynb | 6 +----- docs/source/examples/Widget Alignment.ipynb | 6 +----- docs/source/examples/Widget Asynchronous.ipynb | 6 +----- docs/source/examples/Widget Basics.ipynb | 6 +----- docs/source/examples/Widget Events.ipynb | 6 +----- docs/source/examples/Widget Layout.ipynb | 6 +----- docs/source/examples/Widget List.ipynb | 10 +++------- docs/source/examples/Widget Low Level.ipynb | 6 +----- 20 files changed, 22 insertions(+), 102 deletions(-) diff --git a/docs/source/examples/Beat Frequencies.ipynb b/docs/source/examples/Beat Frequencies.ipynb index a13a2b89ef..a7eebb44ca 100644 --- a/docs/source/examples/Beat Frequencies.ipynb +++ b/docs/source/examples/Beat Frequencies.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'matplotlib', 'numpy'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets matplotlib numpy" ] }, { diff --git a/docs/source/examples/Controller.ipynb b/docs/source/examples/Controller.ipynb index 86bd5a362a..1d95e83eb9 100644 --- a/docs/source/examples/Controller.ipynb +++ b/docs/source/examples/Controller.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install('ipywidgets')\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Exploring Graphs.ipynb b/docs/source/examples/Exploring Graphs.ipynb index 2e37bd2675..6de7e63dec 100644 --- a/docs/source/examples/Exploring Graphs.ipynb +++ b/docs/source/examples/Exploring Graphs.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'matplotlib', 'networkx'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets matplotlib networkx" ] }, { diff --git a/docs/source/examples/Factoring.ipynb b/docs/source/examples/Factoring.ipynb index 923c1c351f..12a284c36b 100644 --- a/docs/source/examples/Factoring.ipynb +++ b/docs/source/examples/Factoring.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'sympy'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets sympy" ] }, { diff --git a/docs/source/examples/Image Browser.ipynb b/docs/source/examples/Image Browser.ipynb index 2bcaa0ab00..6a3eed5686 100644 --- a/docs/source/examples/Image Browser.ipynb +++ b/docs/source/examples/Image Browser.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'matplotlib', 'scikit-learn'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets matplotlib scikit-learn" ] }, { diff --git a/docs/source/examples/Image Processing.ipynb b/docs/source/examples/Image Processing.ipynb index 1ac4c9ad36..ea14dd73f0 100644 --- a/docs/source/examples/Image Processing.ipynb +++ b/docs/source/examples/Image Processing.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'scikit-learn', 'numpy', 'matplotlib'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets scikit-learn numpy matplotlib" ] }, { diff --git a/docs/source/examples/Layout Example.ipynb b/docs/source/examples/Layout Example.ipynb index 1b059e09de..bb3710a979 100644 --- a/docs/source/examples/Layout Example.ipynb +++ b/docs/source/examples/Layout Example.ipynb @@ -28,11 +28,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'ipyleaflet', 'numpy', 'bqplot', 'pandas'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets ipyleaflet numpy bqplot pandas" ] }, { diff --git a/docs/source/examples/Layout Templates.ipynb b/docs/source/examples/Layout Templates.ipynb index 892093119e..09751cf5fb 100644 --- a/docs/source/examples/Layout Templates.ipynb +++ b/docs/source/examples/Layout Templates.ipynb @@ -16,11 +16,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'bqplot', 'numpy'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets bqplot numpy" ] }, { diff --git a/docs/source/examples/Lorenz Differential Equations.ipynb b/docs/source/examples/Lorenz Differential Equations.ipynb index 5076062742..5d4d1d5e5c 100644 --- a/docs/source/examples/Lorenz Differential Equations.ipynb +++ b/docs/source/examples/Lorenz Differential Equations.ipynb @@ -45,11 +45,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'matplotlib', 'numpy', 'scipy'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets matplotlib numpy scipy" ] }, { diff --git a/docs/source/examples/Media widgets.ipynb b/docs/source/examples/Media widgets.ipynb index 5c5176a2da..05b1941803 100644 --- a/docs/source/examples/Media widgets.ipynb +++ b/docs/source/examples/Media widgets.ipynb @@ -16,11 +16,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Output Widget.ipynb b/docs/source/examples/Output Widget.ipynb index aa4439454b..43d8627671 100644 --- a/docs/source/examples/Output Widget.ipynb +++ b/docs/source/examples/Output Widget.ipynb @@ -23,11 +23,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Using Interact.ipynb b/docs/source/examples/Using Interact.ipynb index 36813cef4d..3efd8c3092 100644 --- a/docs/source/examples/Using Interact.ipynb +++ b/docs/source/examples/Using Interact.ipynb @@ -21,11 +21,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Variable Inspector.ipynb b/docs/source/examples/Variable Inspector.ipynb index 3980adb707..717a17d0ba 100644 --- a/docs/source/examples/Variable Inspector.ipynb +++ b/docs/source/examples/Variable Inspector.ipynb @@ -28,11 +28,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Widget Alignment.ipynb b/docs/source/examples/Widget Alignment.ipynb index 025c1f558e..155f14fcde 100644 --- a/docs/source/examples/Widget Alignment.ipynb +++ b/docs/source/examples/Widget Alignment.ipynb @@ -16,11 +16,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Widget Asynchronous.ipynb b/docs/source/examples/Widget Asynchronous.ipynb index 21fa632ae2..4cd07060ab 100644 --- a/docs/source/examples/Widget Asynchronous.ipynb +++ b/docs/source/examples/Widget Asynchronous.ipynb @@ -55,11 +55,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets', 'matplotlib', 'numpy', 'scipy'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets matplotlib numpy scipy" ] }, { diff --git a/docs/source/examples/Widget Basics.ipynb b/docs/source/examples/Widget Basics.ipynb index c1081c83d4..86c76d62eb 100644 --- a/docs/source/examples/Widget Basics.ipynb +++ b/docs/source/examples/Widget Basics.ipynb @@ -78,11 +78,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Widget Events.ipynb b/docs/source/examples/Widget Events.ipynb index 5dde567e27..9b4865b3b7 100644 --- a/docs/source/examples/Widget Events.ipynb +++ b/docs/source/examples/Widget Events.ipynb @@ -41,11 +41,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Widget Layout.ipynb b/docs/source/examples/Widget Layout.ipynb index ac76c4fcc3..fc5dc74210 100644 --- a/docs/source/examples/Widget Layout.ipynb +++ b/docs/source/examples/Widget Layout.ipynb @@ -115,11 +115,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { diff --git a/docs/source/examples/Widget List.ipynb b/docs/source/examples/Widget List.ipynb index 9917d0c0a4..b13849a74a 100644 --- a/docs/source/examples/Widget List.ipynb +++ b/docs/source/examples/Widget List.ipynb @@ -23,11 +23,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, { @@ -1169,8 +1165,8 @@ "\n", "This is useful if you need to compare the picked datetime to naive datetime objects, as Python will otherwise complain!" ] - }, - { + }, + { "cell_type": "code", "execution_count": null, "metadata": {}, diff --git a/docs/source/examples/Widget Low Level.ipynb b/docs/source/examples/Widget Low Level.ipynb index 28df4fcd9e..0584e0deb4 100644 --- a/docs/source/examples/Widget Low Level.ipynb +++ b/docs/source/examples/Widget Low Level.ipynb @@ -127,11 +127,7 @@ "outputs": [], "source": [ "# Imports for JupyterLite\n", - "try:\n", - " import piplite\n", - " await piplite.install(['ipywidgets'])\n", - "except ImportError:\n", - " pass" + "%pip install -q ipywidgets" ] }, {