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

Notebook-6.5.4 #21

Merged
merged 6 commits into from
Feb 20, 2025
Merged

Notebook-6.5.4 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1288158
Update notebook dependency to 6.5.4 and adjust static files import fo…
devincowan Jan 16, 2025
0ce568b
Merge branch 'master' into notebook-6.5.4
devincowan Feb 13, 2025
41e68b2
Merge branch 'master' into notebook-6.5.4
devincowan Feb 17, 2025
2f49e52
Update example URL in README for nbfetch
devincowan Feb 17, 2025
b6bbea7
Add setuptools to install_requires in setup.py
devincowan Feb 17, 2025
6b54c2d
Update hsclient dependency to require version 1.1.3 or higher
devincowan Feb 20, 2025
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jupyter server extension enable --py nbfetch
jupyter lab

# to test fetching, visit the `/nbfetch` url, for example:
http://127.0.0.1:8888/nbfetch/hs-pull?id=432d503a507e493581d25beb3379471a&res_id=432d503a507e493581d25beb3379471a
http://127.0.0.1:8888/nbfetch/hs-pull?id=96310f82dd5247ba8201955750093923&res_id=96310f82dd5247ba8201955750093923
```

`nbfetch` requires HydroShare user authentication (username, password) or authorization (OAuth2) to
Expand Down
5 changes: 4 additions & 1 deletion nbfetch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import jupyter_server
from jupyter_server.extension.application import ExtensionApp
from notebook import DEFAULT_STATIC_FILES_PATH, DEFAULT_TEMPLATE_PATH_LIST
from notebook import DEFAULT_TEMPLATE_PATH_LIST
from notebook.notebookapp import DEFAULT_STATIC_FILES_PATH
import jinja2
import gettext

Expand All @@ -21,6 +22,8 @@ class NbFetchApp(ExtensionApp):
load_other_extensions = True
file_url_prefix = "/"

# Default static files path changed in 6.5.0:
# https://github.com/jupyter/notebook/releases/tag/v6.5.0
# Local path to static files directory.
static_paths = [
os.path.join(HERE, "static"),
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
packages=find_packages(),
include_package_data=True,
platforms="any",
install_requires=["notebook==6.4.6", "tornado", "hsclient>=1.1.2", "jupyter_server"],
install_requires=["notebook==6.5.4", "tornado", "hsclient>=1.1.3", "jupyter_server", "setuptools"],
extras_require={"develop": ["pytest", "pytest-jupyter"]},
data_files=[
(
Expand Down