From d238ccf563e390d424373d813d5a8e068d06c664 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Mon, 6 Mar 2023 08:15:11 +0100 Subject: [PATCH 1/6] Automated Changelog Entry for 6.5.3 on 6.5.x (#6760) Co-authored-by: GitHub Action <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6195bd247c..8652eb62c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,33 @@ Use `pip install pip --upgrade` to upgrade pip. Check pip version with +## 6.5.3 + +([Full Changelog](https://github.com/jupyter/notebook/compare/v6.5.2...7939fc595db4ffc3482031365d17ef72a02c085e)) + +### Enhancements made + +- Add a banner and log to information about the migration to Notebook 7 plan [#6742](https://github.com/jupyter/notebook/pull/6742) ([@echarles](https://github.com/echarles)) +- Add sys_info to page template for 6.5.x [#6668](https://github.com/jupyter/notebook/pull/6668) ([@juhasch](https://github.com/juhasch)) + +### Bugs fixed + +- Add .mo and .json files for translations [#6728](https://github.com/jupyter/notebook/pull/6728) ([@frenzymadness](https://github.com/frenzymadness)) +- Apply PR #6609 to 6.5.x (Fix rename_file and delete_file to handle hidden files properly) [#6660](https://github.com/jupyter/notebook/pull/6660) ([@yacchin1205](https://github.com/yacchin1205)) + +### Other merged PRs + +- Fix ru_RU translation [#6745](https://github.com/jupyter/notebook/pull/6745) ([@andrii-i](https://github.com/andrii-i)) +- Update kernel translation [#6744](https://github.com/jupyter/notebook/pull/6744) ([@JasonWeill](https://github.com/JasonWeill)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyter/notebook/graphs/contributors?from=2022-10-30&to=2023-03-06&type=c)) + +[@andrii-i](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Aandrii-i+updated%3A2022-10-30..2023-03-06&type=Issues) | [@echarles](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Aecharles+updated%3A2022-10-30..2023-03-06&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Afcollonval+updated%3A2022-10-30..2023-03-06&type=Issues) | [@frenzymadness](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Afrenzymadness+updated%3A2022-10-30..2023-03-06&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2022-10-30..2023-03-06&type=Issues) | [@JasonWeill](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3AJasonWeill+updated%3A2022-10-30..2023-03-06&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2022-10-30..2023-03-06&type=Issues) | [@juhasch](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajuhasch+updated%3A2022-10-30..2023-03-06&type=Issues) | [@RRosio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3ARRosio+updated%3A2022-10-30..2023-03-06&type=Issues) | [@venkatasg](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Avenkatasg+updated%3A2022-10-30..2023-03-06&type=Issues) | [@yacchin1205](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ayacchin1205+updated%3A2022-10-30..2023-03-06&type=Issues) + + + ## 6.5.2 ([Full Changelog](https://github.com/jupyter/notebook/compare/v6.5.1...8a00144fa9afc26ff9a29c9abf12db4014f52293)) @@ -33,8 +60,6 @@ Use `pip install pip --upgrade` to upgrade pip. Check pip version with [@bnavigator](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Abnavigator+updated%3A2022-10-13..2022-10-30&type=Issues) | [@echarles](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Aecharles+updated%3A2022-10-13..2022-10-30&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Afcollonval+updated%3A2022-10-13..2022-10-30&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2022-10-13..2022-10-30&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2022-10-13..2022-10-30&type=Issues) | [@RRosio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3ARRosio+updated%3A2022-10-13..2022-10-30&type=Issues) - - ## 6.5.1 ([Full Changelog](https://github.com/jupyter/notebook/compare/v6.5.0...67546dad676025b70b8b5f061c42ed31029f5dac)) From 6fdc8d38e516b1829f3a26c6ad996c9eab742a86 Mon Sep 17 00:00:00 2001 From: GitHub Action <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 07:19:08 +0000 Subject: [PATCH 2/6] Publish 6.5.3 SHA256 hashes: notebook-6.5.3-py3-none-any.whl: 50a334ad9d60b30cb759405168ef6fc3d60350ab5439fb1631544bb09dcb2cce notebook-6.5.3.tar.gz: b12bee3292211d85dd7e588a790ddce30cb3e8fbcfa1e803522a207f60819e05 --- notebook/_version.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notebook/_version.py b/notebook/_version.py index 52074fd6e1..efde66a1da 100644 --- a/notebook/_version.py +++ b/notebook/_version.py @@ -5,7 +5,7 @@ import re # Version string must appear intact for tbump versioning -__version__ = '6.5.2' +__version__ = '6.5.3' # Build up version_info tuple for backwards compatibility pattern = r'(?P\d+).(?P\d+).(?P\d+)(?P.*)' diff --git a/pyproject.toml b/pyproject.toml index 8d598adb20..52ce5c2338 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ before-build-python = ["pip install babel", "npm install -g po2json"] ignore-glob = ["docs/source/examples/Notebook/Working With Markdown Cells.ipynb", "docs-translations/**/README.md", "docs/source/contributing.rst", "docs/source/examples/Notebook/JavaScript Notebook Extensions.ipynb", "CHANGELOG.md", "notebook/static/components/**/*.*"] [tool.tbump.version] -current = "6.5.2" +current = "6.5.3" regex = ''' (?P\d+)\.(?P\d+)\.(?P\d+) ((?Pa|b|rc|.dev)(?P\d+))? From 428e00bef821acb42f13843fb2949d225d081d56 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Fri, 31 Mar 2023 17:19:46 +0200 Subject: [PATCH 3/6] Add show_banner trait to control the banner display (#6808) Co-authored-by: Jeremy Tuloup Co-authored-by: Rosio --- docs/source/frontend_config.rst | 8 ++++++++ notebook/base/handlers.py | 5 +++++ notebook/notebookapp.py | 7 +++++++ notebook/templates/page.html | 2 ++ 4 files changed, 22 insertions(+) diff --git a/docs/source/frontend_config.rst b/docs/source/frontend_config.rst index 0ce675b6b4..f74378ca37 100644 --- a/docs/source/frontend_config.rst +++ b/docs/source/frontend_config.rst @@ -89,3 +89,11 @@ taking various value depending on the page where the configuration is issued. ``
`` can take various values like ``notebook``, ``tree``, and ``editor``. A ``common`` section contains configuration settings shared by all pages. + +Persisting configuration settings +--------------------------------- + +A banner might be shown to users to inform them about news or updates. This +banner can be hidden launching the server with the show_banner trait.:: + + jupyter notebook --NotebookApp.show_banner=False diff --git a/notebook/base/handlers.py b/notebook/base/handlers.py index 97c818a342..41ba1be6e1 100755 --- a/notebook/base/handlers.py +++ b/notebook/base/handlers.py @@ -244,6 +244,10 @@ def default_url(self): def ws_url(self): return self.settings.get('websocket_url', '') + @property + def show_banner(self): + return self.settings.get('show_banner', True) + @property def contents_js_source(self): self.log.debug("Using contents: %s", self.settings.get('contents_js_source', @@ -530,6 +534,7 @@ def template_namespace(self): xsrf_token=self.xsrf_token.decode('utf8'), nbjs_translations=json.dumps(combine_translations( self.request.headers.get('Accept-Language', ''))), + show_banner=self.show_banner, **self.jinja_template_vars ) diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py index 070dbb9e54..e656f72802 100755 --- a/notebook/notebookapp.py +++ b/notebook/notebookapp.py @@ -278,6 +278,7 @@ def init_settings(self, jupyter_app, kernel_manager, contents_manager, }, version_hash=version_hash, ignore_minified_js=jupyter_app.ignore_minified_js, + show_banner=jupyter_app.show_banner, # rate limits iopub_msg_rate_limit=jupyter_app.iopub_msg_rate_limit, @@ -1171,6 +1172,12 @@ def _default_allow_remote(self): """ ) + show_banner = Bool(True, config=True, + help="""Whether the banner is displayed on the page. + + By default, the banner is displayed. + """) + open_browser = Bool(True, config=True, help="""Whether to open in a browser after starting. The specific browser used is platform dependent and diff --git a/notebook/templates/page.html b/notebook/templates/page.html index ba061f21eb..4006b79358 100644 --- a/notebook/templates/page.html +++ b/notebook/templates/page.html @@ -136,6 +136,7 @@