Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loosen Jupyter pinning #3288

Merged
merged 7 commits into from
Dec 20, 2023
Merged

Loosen Jupyter pinning #3288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40b4a4e
More flexible pinning of Jupyter optional dependencies
astrojuanlu Nov 8, 2023
22cdedb
Add Jupyter changes to release notes
astrojuanlu Nov 8, 2023
8fbeb32
Add future note about problematic test code
astrojuanlu Nov 8, 2023
0ea2f9d
Restore notebook dependency
astrojuanlu Nov 8, 2023
e2353ab
Restore ipython lower bound
astrojuanlu Nov 9, 2023
0fdb81c
Update Jupyter liveness test
astrojuanlu Dec 11, 2023
300c27b
Add small pause after server aliveness check
astrojuanlu Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

## Bug fixes and other changes
* Removed example pipeline requirements when examples are not selected in `tools`.
* Allowed modern versions of JupyterLab and Jupyter Notebooks.

## Breaking changes to the API
* Added logging about not using async mode in `SequentiallRunner` and `ParallelRunner`.
Expand Down
7 changes: 5 additions & 2 deletions features/steps/cli_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import shutil
import textwrap
from pathlib import Path
from time import time
from time import sleep, time

import behave
import requests
Expand Down Expand Up @@ -391,9 +391,12 @@ def exec_notebook(context, command):
@then('I wait for the jupyter webserver to run for up to "{timeout:d}" seconds')
def wait_for_notebook_to_run(context, timeout):
timeout_start = time()
# FIXME: Will continue iterating after the process has returned
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this comment stay? 👀

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's stating that there's a flaw in the current logic, but I didn't have time to fix it 😅

while time() < timeout_start + timeout:
stdout = context.result.stdout.readline()
if "http://127.0.0.1:" in stdout:
# Take a breath, and declare success
sleep(1)
break

if time() >= timeout_start + timeout:
Expand Down Expand Up @@ -661,7 +664,7 @@ def check_jupyter_nb_proc_on_port(context: behave.runner.Context, port: int):
"""
url = f"http://localhost:{port}"
try:
_check_service_up(context, url, "Jupyter Notebook")
_check_service_up(context, url, "Jupyter Server")
finally:
context.result.terminate()

Expand Down
8 changes: 3 additions & 5 deletions features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
black~=22.0
ipython>=7.31.1, <8.0; python_version < '3.8'
ipython~=8.10; python_version >= '3.8'
astrojuanlu marked this conversation as resolved.
Show resolved Hide resolved
jupyter~=1.0
jupyterlab_server>=2.11.1, <2.16.0
jupyterlab~=3.0, <3.6.0
ipython>=8.10
jupyterlab>=3.0
notebook
astrojuanlu marked this conversation as resolved.
Show resolved Hide resolved
kedro~={{ cookiecutter.kedro_version}}
kedro-datasets[pandas.CSVDataset]
kedro-telemetry>=0.3.1
Expand Down
9 changes: 3 additions & 6 deletions kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
black~=22.0
ipython~=8.10; python_version >= '3.8'
jupyter~=1.0
jupyterlab_server>=2.11.1, <2.16.0
jupyterlab~=3.0, <3.6.0
ipython>=8.10
jupyterlab>=3.0
notebook
astrojuanlu marked this conversation as resolved.
Show resolved Hide resolved
kedro~={{ cookiecutter.kedro_version }}
kedro-telemetry>=0.3.1
pytest-cov~=3.0
pytest-mock>=1.7.1, <2.0
pytest~=7.2
ruff~=0.0.290
# Pin problematic traitlets release - https://github.com/jupyter/notebook/issues/7048
traitlets<5.10.0