From eb78fd626d1b8a5ce5ca2effc4584c937ce633be Mon Sep 17 00:00:00 2001 From: bumblefudge Date: Wed, 11 Sep 2024 16:04:47 +0200 Subject: [PATCH 1/2] minor tutorial edits --- INSTALLATION.md | 12 ++++++++++-- binder/requirements-dev.txt | 2 ++ binder/requirements-pip-not-used.txt | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/INSTALLATION.md b/INSTALLATION.md index 7adf135..57bbfff 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -32,7 +32,7 @@ However, if you prefer a direct local installation, instructions follow. pitfalls in the steps to follow. ``` - python -m pip install --upgrade pip setuptools numpy + python -m pip install --upgrade pip setuptools numpy testresources ``` * Clone this repository. @@ -45,7 +45,15 @@ However, if you prefer a direct local installation, instructions follow. * Install the requirements. ``` - python -m pip install -r binder/requirements.txt + python -m pip install -r binder/requirements-dev.txt + ``` + ``` + python -m pip install -r binder/requirements-preview.txt + ``` + ``` + python -m pip install -r binder/runtime.txt + ``` + ``` python -m pip install -e ./bluesky-tutorial-utils # MUST use -e here ``` diff --git a/binder/requirements-dev.txt b/binder/requirements-dev.txt index ccf2e9f..3c2d5ea 100644 --- a/binder/requirements-dev.txt +++ b/binder/requirements-dev.txt @@ -3,3 +3,5 @@ six # looks like it's an undeclared dependency of docker Python bindings nbdime nbstripout pre-commit +jupyterlab >=3 + diff --git a/binder/requirements-pip-not-used.txt b/binder/requirements-pip-not-used.txt index 83a19fe..7fb313a 100644 --- a/binder/requirements-pip-not-used.txt +++ b/binder/requirements-pip-not-used.txt @@ -16,7 +16,6 @@ ipympl >=0.6.3 ipywidgets <7.7 jupyter-book jupyter-cache < 0.5 -jupyterlab >=3 kiwisolver <1.2 lmfit matplotlib >=3.4 From 7e0e5bc551d7f07849f33d95c43646dbb9331266 Mon Sep 17 00:00:00 2001 From: Bumblefudge Date: Mon, 16 Sep 2024 15:58:11 +0200 Subject: [PATCH 2/2] remove runtime.txt --- INSTALLATION.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/INSTALLATION.md b/INSTALLATION.md index 57bbfff..ef1ff40 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -51,9 +51,6 @@ However, if you prefer a direct local installation, instructions follow. python -m pip install -r binder/requirements-preview.txt ``` ``` - python -m pip install -r binder/runtime.txt - ``` - ``` python -m pip install -e ./bluesky-tutorial-utils # MUST use -e here ```