From 48b5faba57205b29f9db69aa5f14db973f591eed Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Mon, 12 Feb 2018 10:39:14 +0000 Subject: [PATCH 1/3] Don't install gettext into builtins --- notebook/transutils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/notebook/transutils.py b/notebook/transutils.py index 1bde12e834..eed860aa33 100644 --- a/notebook/transutils.py +++ b/notebook/transutils.py @@ -10,5 +10,4 @@ # Set up message catalog access base_dir = os.path.realpath(os.path.join(__file__, '..', '..')) trans = gettext.translation('notebook', localedir=os.path.join(base_dir, 'notebook/i18n'), fallback=True) -trans.install() _ = trans.gettext From 66bd2fbf20410ef94eeaa76df8aa86b1894dac2d Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Mon, 12 Feb 2018 11:09:46 +0000 Subject: [PATCH 2/3] Allow use of newest nbsphinx for building docs Needed for compatibility with Sphinx 1.7 --- docs/doc-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/doc-requirements.txt b/docs/doc-requirements.txt index fbdd21cd97..272e9dfcc1 100644 --- a/docs/doc-requirements.txt +++ b/docs/doc-requirements.txt @@ -1,3 +1,3 @@ sphinx>=1.3.6 sphinx-rtd-theme -nbsphinx==0.2.14 +nbsphinx From 83fd9bb176858449f67b1161d41236f022318d99 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Mon, 12 Feb 2018 11:49:44 +0000 Subject: [PATCH 3/3] Squash some Sphinx warnings --- docs/Makefile | 2 +- docs/source/changelog.rst | 1 + notebook/notebookapp.py | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 814aed7b51..02cb617a36 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -51,7 +51,7 @@ help: clean: rm -rf $(BUILDDIR)/* - rm -rf config.rst + rm -rf source/config.rst html: source/config.rst $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 5d9ce7feb1..3d39903804 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -13,6 +13,7 @@ For more detailed information, see upgrade to the latest release. .. we push for pip 9+ or it will break for Python 2 users when IPython 6 is out. + We strongly recommend that you upgrade to version 9+ of pip before upgrading ``notebook``. .. tip:: diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py index a1602f4695..7579b0d2b8 100755 --- a/notebook/notebookapp.py +++ b/notebook/notebookapp.py @@ -832,9 +832,11 @@ def _token_changed(self, change): `new` argument passed to the standard library method `webbrowser.open`. The behaviour is not guaranteed, but depends on browser support. Valid values are: - 2 opens a new tab, - 1 opens a new window, - 0 opens in an existing window. + + - 2 opens a new tab, + - 1 opens a new window, + - 0 opens in an existing window. + See the `webbrowser.open` documentation for details. """))