[Python-modules-commits] [jupyter-notebook] 11/19: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Sun Sep 17 21:09:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
chronitis-guest pushed a commit to branch master
in repository jupyter-notebook.
commit fd0056dabaa2bb36ca160acada2e9f09f863b17c
Merge: af8b814 381389a
Author: Gordon Ball <gordon at chronitis.net>
Date: Sun Sep 17 21:29:14 2017 +0200
merge patched into master
.gitignore | 3 +
.travis.yml | 15 +-
MANIFEST.in | 2 +-
bower.json | 9 +-
debian/.git-dpm | 6 +-
.../0001-Nodejs-binary-and-import-names.patch | 6 +-
.../0002-Use-local-MathJax-in-documentation.patch | 7 +-
...ptools-in-setup.py-so-dependencies-are-de.patch | 2 +-
...0004-jquery-ui-1.12-compatibility-changes.patch | 8 +-
...with-source-map-basepath-option-for-repro.patch | 6 +-
...d-https-github.com-less-less.js-pull-3002.patch | 6 +-
...ific-hack-to-fix-upstream-s-non-increment.patch | 2 +-
...rs-in-documentation-notebooks-during-buil.patch | 15 +-
docs/doc-requirements.txt | 3 +-
docs/source/_static/images/cell-tags-toolbar.png | Bin 103041 -> 89424 bytes
docs/source/changelog.rst | 31 +-
docs/source/conf.py | 2 +
.../examples/Notebook/Importing Notebooks.ipynb | 5 +-
.../source/examples/Notebook/Notebook Basics.ipynb | 2 +-
.../Notebook/What is the Jupyter Notebook.ipynb | 3 +-
.../Notebook/Working With Markdown Cells.ipynb | 14 +-
docs/source/frontend_config.rst | 2 +-
docs/source/notebook.rst | 33 +-
docs/source/public_server.rst | 2 +-
docs/source/security.rst | 5 +-
notebook/_sysinfo.py | 14 +-
notebook/_version.py | 2 +-
notebook/allow76.py | 311 -
notebook/base/handlers.py | 47 +-
notebook/base/zmqhandlers.py | 11 +-
notebook/files/handlers.py | 13 +-
notebook/i18n/README.md | 122 +
notebook/i18n/babel_nbjs.cfg | 11 +
notebook/i18n/babel_nbui.cfg | 4 +
notebook/i18n/babel_notebook.cfg | 2 +
notebook/i18n/nbjs.json | 12 +
notebook/i18n/nbjs.pot | 1927 +++++
notebook/i18n/nbui.pot | 731 ++
notebook/i18n/notebook.pot | 480 +
notebook/jstest.py | 2 -
notebook/nbconvert/handlers.py | 4 +-
notebook/nbextensions.py | 132 +-
notebook/notebookapp.py | 383 +-
notebook/services/contents/filemanager.py | 41 +-
notebook/services/contents/handlers.py | 27 +-
notebook/services/contents/manager.py | 10 +-
.../services/contents/tests/test_contents_api.py | 4 +-
notebook/services/contents/tests/test_manager.py | 15 +-
notebook/services/kernels/handlers.py | 19 +-
notebook/services/kernels/kernelmanager.py | 107 +-
notebook/services/security/handlers.py | 6 +-
notebook/services/shutdown.py | 15 +
notebook/static/auth/js/loginmain.js | 2 +-
notebook/static/auth/js/logoutmain.js | 2 +-
notebook/static/base/images/favicon-busy-1.ico | Bin 0 -> 1150 bytes
notebook/static/base/images/favicon-busy-2.ico | Bin 0 -> 1150 bytes
notebook/static/base/images/favicon-busy-3.ico | Bin 0 -> 1150 bytes
notebook/static/base/images/favicon-busy.ico | Bin 32038 -> 0 bytes
notebook/static/base/images/favicon-file.ico | Bin 0 -> 1150 bytes
notebook/static/base/images/favicon-notebook.ico | Bin 0 -> 1150 bytes
notebook/static/base/images/favicon-terminal.ico | Bin 0 -> 1150 bytes
notebook/static/base/js/dialog.js | 72 +-
notebook/static/base/js/i18n.js | 54 +
notebook/static/base/js/i18nload.js | 26 +
notebook/static/base/js/namespace.js | 2 +-
notebook/static/base/js/page.js | 18 +-
notebook/static/base/js/promises.js | 26 +
notebook/static/base/js/utils.js | 86 +-
notebook/static/base/less/page.less | 17 +-
notebook/static/custom/custom.js | 24 +-
notebook/static/edit/js/editor.js | 80 +-
notebook/static/edit/js/main.js | 2 +-
notebook/static/edit/js/menubar.js | 2 +
notebook/static/edit/js/savewidget.js | 5 +
notebook/static/edit/less/edit.less | 4 +
notebook/static/favicon.ico | 1 +
notebook/static/notebook/js/about.js | 26 +-
notebook/static/notebook/js/actions.js | 266 +-
notebook/static/notebook/js/cell.js | 13 +-
notebook/static/notebook/js/celltoolbar.js | 7 +-
.../notebook/js/celltoolbarpresets/attachments.js | 9 +-
.../notebook/js/celltoolbarpresets/default.js | 9 +-
.../notebook/js/celltoolbarpresets/example.js | 7 -
.../notebook/js/celltoolbarpresets/rawcell.js | 15 +-
.../notebook/js/celltoolbarpresets/slideshow.js | 18 +-
.../static/notebook/js/celltoolbarpresets/tags.js | 13 +-
notebook/static/notebook/js/clipboard.js | 22 +-
notebook/static/notebook/js/codecell.js | 29 +-
notebook/static/notebook/js/commandpalette.js | 28 +-
notebook/static/notebook/js/completer.js | 11 +-
notebook/static/notebook/js/kernelselector.js | 23 +-
notebook/static/notebook/js/main.js | 6 +-
notebook/static/notebook/js/maintoolbar.js | 18 +-
notebook/static/notebook/js/mathjaxutils.js | 19 +-
notebook/static/notebook/js/menubar.js | 15 +-
notebook/static/notebook/js/notebook.js | 207 +-
notebook/static/notebook/js/notificationarea.js | 154 +-
notebook/static/notebook/js/outputarea.js | 92 +-
notebook/static/notebook/js/pager.js | 11 +-
notebook/static/notebook/js/promises.js | 22 +
notebook/static/notebook/js/quickhelp.js | 136 +-
notebook/static/notebook/js/savewidget.js | 31 +-
notebook/static/notebook/js/searchandreplace.js | 38 +-
notebook/static/notebook/js/shortcuteditor.js | 2 +-
notebook/static/notebook/js/textcell.js | 16 +-
notebook/static/notebook/js/toolbar.js | 41 +-
notebook/static/notebook/js/tooltip.js | 17 +-
notebook/static/notebook/js/tour.js | 62 +-
notebook/static/notebook/less/kernelselector.less | 2 -
notebook/static/notebook/less/renderedhtml.less | 34 +-
notebook/static/notebook/less/savewidget.less | 22 +-
notebook/static/notebook/less/tagbar.less | 1 +
notebook/static/notebook/less/toolbar.less | 4 +
notebook/static/robots.txt | 2 +
notebook/static/services/contents.js | 10 +
notebook/static/services/kernels/comm.js | 16 +-
notebook/static/services/kernels/kernel.js | 2 +-
notebook/static/terminal/js/main.js | 4 +-
notebook/static/tree/js/kernellist.js | 7 +-
notebook/static/tree/js/main.js | 4 +-
notebook/static/tree/js/newnotebook.js | 13 +-
notebook/static/tree/js/notebooklist.js | 350 +-
notebook/static/tree/js/sessionlist.js | 19 +-
notebook/static/tree/js/terminallist.js | 7 +-
notebook/templates/404.html | 2 +-
notebook/templates/edit.html | 36 +-
notebook/templates/error.html | 2 +-
notebook/templates/login.html | 10 +-
notebook/templates/logout.html | 11 +-
notebook/templates/notebook.html | 229 +-
notebook/templates/page.html | 22 +-
notebook/templates/terminal.html | 11 +-
notebook/templates/tree.html | 79 +-
notebook/tests/services/serialize.js | 4 -
notebook/tests/test_files.py | 2 +-
notebook/tests/test_nbextensions.py | 28 +-
notebook/tests/test_notebookapp.py | 36 +
notebook/transutils.py | 14 +
notebook/utils.py | 45 +-
notebook/view/handlers.py | 2 +-
scripts/less-watch | 42 -
setupbase.py | 16 +-
tools/build-main.js | 5 +-
tools/patches/codemirror.js | 9124 --------------------
144 files changed, 5828 insertions(+), 10836 deletions(-)
diff --cc debian/.git-dpm
index 0b9a8c4,0000000..1d35348
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 606e3e9685110115631e3d869c55d8fe97cc7251
- 606e3e9685110115631e3d869c55d8fe97cc7251
- 9ffa64eb4552f7b0a11e62aded335efd951ffb1f
++381389a7031ddec3113646dd9fd9ca0f2f9fc716
++381389a7031ddec3113646dd9fd9ca0f2f9fc716
++011fc69ecbd29b048567dcf974167c5a927e3598
+011fc69ecbd29b048567dcf974167c5a927e3598
+jupyter-notebook_5.1.0.orig.tar.gz
+a4d0bf951a66209b2f82c1fc9985ce14be261db6
+5634286
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Nodejs-binary-and-import-names.patch
index 28d9f1d,0000000..43cc180
mode 100644,000000..100644
--- a/debian/patches/0001-Nodejs-binary-and-import-names.patch
+++ b/debian/patches/0001-Nodejs-binary-and-import-names.patch
@@@ -1,23 -1,0 +1,23 @@@
- From a0a4a3207bbe7d442cb2b1962aeee60462089aff Mon Sep 17 00:00:00 2001
++From 5f3532fd75d7df9a3f046f3a2760d9618e4ed010 Mon Sep 17 00:00:00 2001
+From: Gordon Ball <gordon at chronitis.net>
+Date: Mon, 24 Oct 2016 14:38:07 +0200
+Subject: Nodejs binary and import names
+
+ * Binary node -> nodejs
+---
+ setupbase.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setupbase.py b/setupbase.py
- index afaa116..122a362 100644
++index 9dc7c60..e52e1e3 100644
+--- a/setupbase.py
++++ b/setupbase.py
- @@ -504,7 +504,7 @@ class CompileJS(Command):
++@@ -498,7 +498,7 @@ class CompileJS(Command):
+ log.info("%s up to date" % target)
+ return
+ log.info("Rebuilding %s" % target)
+- run(['node', 'tools/build-main.js', name])
++ run(['nodejs', 'tools/build-main.js', name])
+
+ def run(self):
+ self.run_command('jsdeps')
diff --cc debian/patches/0002-Use-local-MathJax-in-documentation.patch
index 7e353ce,0000000..48fcabe
mode 100644,000000..100644
--- a/debian/patches/0002-Use-local-MathJax-in-documentation.patch
+++ b/debian/patches/0002-Use-local-MathJax-in-documentation.patch
@@@ -1,21 -1,0 +1,22 @@@
- From ff95e13bcbb082a5083c366a89c0a59f40005f9e Mon Sep 17 00:00:00 2001
++From 27916bab427e8efca27e4d384c2bf29971eeb438 Mon Sep 17 00:00:00 2001
+From: Gordon Ball <gordon at chronitis.net>
+Date: Thu, 27 Oct 2016 17:20:12 +0200
+Subject: Use local MathJax in documentation
+
+---
+ docs/source/conf.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index c82a234..d35dead 100644
++index 0362a41..692fc68 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
- @@ -343,5 +343,7 @@ intersphinx_mapping = {
++@@ -343,6 +343,8 @@ intersphinx_mapping = {
+ 'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
+ }
+
++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax/js?config=TeX-AMD-MML_HTMLorMML'
++
+ spelling_lang='en_US'
+ spelling_word_list_filename='spelling_wordlist.txt'
++
diff --cc debian/patches/0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
index 89028f0,0000000..01a1128
mode 100644,000000..100644
--- a/debian/patches/0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
+++ b/debian/patches/0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 7c1e6c2dd71656dd4150983689737363ad85ba6b Mon Sep 17 00:00:00 2001
++From 180545ab46d359ec05da2ca23e2282c5dfdde644 Mon Sep 17 00:00:00 2001
+From: Gordon Ball <gordon at chronitis.net>
+Date: Fri, 28 Oct 2016 12:02:40 +0200
+Subject: Unmask setuptools in setup.py so dependencies are detected
+
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3ef88d4..d409dce 100755
+--- a/setup.py
++++ b/setup.py
+@@ -129,8 +129,7 @@ setup_args['cmdclass'] = {
+ # Handle scripts, dependencies, and setuptools specific things
+ #---------------------------------------------------------------------------
+
+-if any(arg.startswith('bdist') for arg in sys.argv):
+- import setuptools
++import setuptools
+
+ # This dict is used for passing extra arguments that are setuptools
+ # specific to setup
diff --cc debian/patches/0004-jquery-ui-1.12-compatibility-changes.patch
index de90a25,0000000..5f95bc5
mode 100644,000000..100644
--- a/debian/patches/0004-jquery-ui-1.12-compatibility-changes.patch
+++ b/debian/patches/0004-jquery-ui-1.12-compatibility-changes.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 4f20c82ac4b1e7f92a18362b497d494929d8d58e Mon Sep 17 00:00:00 2001
++From 3c892da105b000ad263742c97f3a26ad69780796 Mon Sep 17 00:00:00 2001
+From: Gordon Ball <gordon at chronitis.net>
+Date: Mon, 7 Nov 2016 19:02:34 +0100
+Subject: jquery-ui 1.12 compatibility changes
+
+---
+ notebook/templates/page.html | 1 -
+ tools/build-main.js | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/notebook/templates/page.html b/notebook/templates/page.html
- index e40b314..a5de3e9 100644
++index 7665bb4..b431dd1 100644
+--- a/notebook/templates/page.html
++++ b/notebook/templates/page.html
+@@ -69,7 +69,6 @@
+ },
+ "jquery-ui": {
+ deps: ["jquery"],
+- exports: "$"
+ }
+ },
+ waitSeconds: 30,
+diff --git a/tools/build-main.js b/tools/build-main.js
- index 44b5b70..df822da 100644
++index 44b12a3..37f74cb 100644
+--- a/tools/build-main.js
++++ b/tools/build-main.js
- @@ -53,7 +53,6 @@ var rjs_config = {
++@@ -56,7 +56,6 @@ var rjs_config = {
+ },
+ "jquery-ui": {
+ deps: ["jquery"],
+- exports: "$"
+ },
+ },
+
diff --cc debian/patches/0005-Call-lessc-with-source-map-basepath-option-for-repro.patch
index b643816,0000000..09d059b
mode 100644,000000..100644
--- a/debian/patches/0005-Call-lessc-with-source-map-basepath-option-for-repro.patch
+++ b/debian/patches/0005-Call-lessc-with-source-map-basepath-option-for-repro.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 5bffa001a1db9d8829d51eebdf94979af0d4f4ab Mon Sep 17 00:00:00 2001
++From a3525340ba675a8b6ae223e8002b3bc33f743c46 Mon Sep 17 00:00:00 2001
+From: Ximin Luo <infinity0 at debian.org>
+Date: Wed, 7 Dec 2016 18:09:01 +0100
+Subject: Call lessc with --source-map-basepath option for reproducibility
+
+---
+ setupbase.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setupbase.py b/setupbase.py
- index 122a362..b240eff 100644
++index e52e1e3..02bbc7a 100644
+--- a/setupbase.py
++++ b/setupbase.py
- @@ -433,7 +433,7 @@ class CompileCSS(Command):
++@@ -427,7 +427,7 @@ class CompileCSS(Command):
+ for src, dst in zip(self.sources, self.targets):
+ try:
+ run(['lessc',
+- '--source-map',
++ '--source-map', '--source-map-basepath='+os.path.dirname(__file__),
+ '--include-path=%s' % pipes.quote(static),
+ src,
+ dst,
diff --cc debian/patches/0006-Work-around-https-github.com-less-less.js-pull-3002.patch
index e84c33a,0000000..f4fe5af
mode 100644,000000..100644
--- a/debian/patches/0006-Work-around-https-github.com-less-less.js-pull-3002.patch
+++ b/debian/patches/0006-Work-around-https-github.com-less-less.js-pull-3002.patch
@@@ -1,22 -1,0 +1,22 @@@
- From b2ca5a23a7367b5015a16e5d6824f23569d3a7cb Mon Sep 17 00:00:00 2001
++From e7062bf4a3aa3d956b0f77de0637dcfc1d50855b Mon Sep 17 00:00:00 2001
+From: Ximin Luo <infinity0 at debian.org>
+Date: Wed, 7 Dec 2016 18:49:06 +0100
+Subject: Work around https://github.com/less/less.js/pull/3002
+
+---
+ setupbase.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setupbase.py b/setupbase.py
- index b240eff..cbc5b42 100644
++index 02bbc7a..c9945f4 100644
+--- a/setupbase.py
++++ b/setupbase.py
- @@ -436,7 +436,7 @@ class CompileCSS(Command):
++@@ -430,7 +430,7 @@ class CompileCSS(Command):
+ '--source-map', '--source-map-basepath='+os.path.dirname(__file__),
+ '--include-path=%s' % pipes.quote(static),
+ src,
+- dst,
++ os.path.relpath(dst, repo_root),
+ ], cwd=repo_root, env=env)
+ except OSError as e:
+ print("Failed to build css: %s" % e, file=sys.stderr)
diff --cc debian/patches/0007-Debian-specific-hack-to-fix-upstream-s-non-increment.patch
index 3aa8cf6,0000000..99b13f9
mode 100644,000000..100644
--- a/debian/patches/0007-Debian-specific-hack-to-fix-upstream-s-non-increment.patch
+++ b/debian/patches/0007-Debian-specific-hack-to-fix-upstream-s-non-increment.patch
@@@ -1,41 -1,0 +1,41 @@@
- From 6249f12e67e2e37dc45e2f50c35312ca70ca649b Mon Sep 17 00:00:00 2001
++From 15e7289b8afb8f3c2f2ddda0601b115bda7ad30a Mon Sep 17 00:00:00 2001
+From: Ximin Luo <infinity0 at debian.org>
+Date: Wed, 7 Dec 2016 21:54:46 +0100
+Subject: Debian-specific hack to fix upstream's (non-)incremental build
+
+---
+ setup.py | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d409dce..509038c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -113,15 +113,18 @@ from distutils.command.build_py import build_py
+ from distutils.command.sdist import sdist
+
+
+-setup_args['cmdclass'] = {
+- 'build_py': css_js_prerelease(
+- check_package_data_first(build_py)),
+- 'sdist' : css_js_prerelease(sdist, strict=True),
+- 'css' : CompileCSS,
+- 'js' : CompileJS,
+- 'jsdeps' : Bower,
+- 'jsversion' : JavascriptVersion,
+-}
++if os.path.exists("debian/debhelper-build-stamp"):
++ setup_args['cmdclass'] = {}
++else:
++ setup_args['cmdclass'] = {
++ 'build_py': css_js_prerelease(
++ check_package_data_first(build_py)),
++ 'sdist' : css_js_prerelease(sdist, strict=True),
++ 'css' : CompileCSS,
++ 'js' : CompileJS,
++ 'jsdeps' : Bower,
++ 'jsversion' : JavascriptVersion,
++ }
+
+
+
diff --cc debian/patches/0008-Ignore-errors-in-documentation-notebooks-during-buil.patch
index fda1b4e,0000000..22f7b9d
mode 100644,000000..100644
--- a/debian/patches/0008-Ignore-errors-in-documentation-notebooks-during-buil.patch
+++ b/debian/patches/0008-Ignore-errors-in-documentation-notebooks-during-buil.patch
@@@ -1,19 -1,0 +1,18 @@@
- From 606e3e9685110115631e3d869c55d8fe97cc7251 Mon Sep 17 00:00:00 2001
++From 381389a7031ddec3113646dd9fd9ca0f2f9fc716 Mon Sep 17 00:00:00 2001
+From: Gordon Ball <gordon at chronitis.net>
+Date: Sun, 25 Jun 2017 11:53:23 +0200
+Subject: Ignore errors in documentation notebooks during build
+
+---
- docs/source/conf.py | 2 ++
- 1 file changed, 2 insertions(+)
++ docs/source/conf.py | 1 +
++ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index d35dead..81a1b89 100644
++index 692fc68..8cbe5fb 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
- @@ -347,3 +347,5 @@ mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax/js?config=TeX-AMD-M
++@@ -350,3 +350,4 @@ spelling_word_list_filename='spelling_wordlist.txt'
+
- spelling_lang='en_US'
- spelling_word_list_filename='spelling_wordlist.txt'
- +
++ # import before any doc is built, so _ is guaranteed to be injected
++ import notebook.transutils
++nbsphinx_allow_errors = True
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/jupyter-notebook.git
More information about the Python-modules-commits
mailing list