[Python-modules-commits] [jupyter-notebook] 11/14: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Sun Nov 12 20:26:15 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 dd1ee8358d579686fafa2e7cc9ccaa9731ed75d2
Merge: 442b0ff 6c3e5d0
Author: Gordon Ball <gordon at chronitis.net>
Date: Thu Nov 9 15:11:43 2017 +0000
merge patched into master
.travis.yml | 15 +-
CONTRIBUTING.rst | 4 +-
bower.json | 2 +-
debian/.git-dpm | 6 +-
.../0001-Nodejs-binary-and-import-names.patch | 2 +-
.../0002-Use-local-MathJax-in-documentation.patch | 6 +-
...ptools-in-setup.py-so-dependencies-are-de.patch | 4 +-
...0004-jquery-ui-1.12-compatibility-changes.patch | 6 +-
...with-source-map-basepath-option-for-repro.patch | 2 +-
...d-https-github.com-less-less.js-pull-3002.patch | 2 +-
...ific-hack-to-fix-upstream-s-non-increment.patch | 4 +-
...rs-in-documentation-notebooks-during-buil.patch | 6 +-
docs/source/changelog.rst | 23 +
docs/source/conf.py | 7 +
docs/source/config_overview.rst | 2 +-
...ing Jupyter Extensions as Python Packages.ipynb | 8 +-
.../examples/Notebook/Importing Notebooks.ipynb | 2 +-
.../Notebook/JavaScript Notebook Extensions.ipynb | 4 +-
.../examples/Notebook/Typesetting Equations.ipynb | 6 +-
.../Notebook/What is the Jupyter Notebook.ipynb | 12 +-
.../Notebook/Working With Markdown Cells.ipynb | 2 +-
docs/source/extending/contents.rst | 2 +-
docs/source/links.txt | 2 +-
docs/source/notebook.rst | 4 +-
docs/source/public_server.rst | 8 +-
notebook/_version.py | 2 +-
notebook/base/handlers.py | 92 +-
notebook/bundler/tarball_bundler.py | 7 +-
notebook/bundler/zip_bundler.py | 3 +-
notebook/files/handlers.py | 26 +-
notebook/i18n/nbjs.json | 1 +
notebook/i18n/zh-CN/LC_MESSAGES/nbjs.po | 2334 ++++++++++++++++++++
notebook/i18n/zh-CN/LC_MESSAGES/nbui.po | 731 ++++++
notebook/i18n/zh-CN/LC_MESSAGES/notebook.po | 485 ++++
notebook/nbconvert/handlers.py | 56 +-
notebook/notebookapp.py | 8 +-
notebook/services/api/handlers.py | 3 +-
notebook/services/config/handlers.py | 5 +-
notebook/services/contents/filemanager.py | 4 +
notebook/services/contents/handlers.py | 12 +-
notebook/services/contents/manager.py | 51 +-
notebook/services/contents/tests/test_manager.py | 6 +
notebook/services/kernels/handlers.py | 69 +-
notebook/services/kernels/kernelmanager.py | 121 +-
notebook/services/kernelspecs/handlers.py | 4 +-
notebook/services/nbconvert/handlers.py | 3 +-
notebook/services/security/handlers.py | 3 +-
notebook/services/sessions/handlers.py | 7 +-
notebook/static/auth/js/main.js | 5 +-
notebook/static/auth/less/login.less | 19 +-
notebook/static/base/js/namespace.js | 2 +-
notebook/static/base/js/page.js | 4 +-
notebook/static/base/less/page.less | 15 +-
notebook/static/bidi/bidi.js | 57 +
notebook/static/bidi/numericshaping.js | 42 +
notebook/static/custom/custom.css | 16 +-
notebook/static/edit/js/editor.js | 12 +-
notebook/static/edit/js/main.js | 5 +-
notebook/static/edit/js/menubar.js | 2 +-
notebook/static/edit/js/savewidget.js | 8 +-
notebook/static/notebook/js/cell.js | 2 -
notebook/static/notebook/js/main.js | 7 +-
notebook/static/notebook/js/notebook.js | 2 +-
notebook/static/notebook/js/notificationarea.js | 17 +-
notebook/static/notebook/js/outputarea.js | 12 +-
notebook/static/notebook/js/quickhelp.js | 7 +-
notebook/static/notebook/js/savewidget.js | 7 +-
notebook/static/notebook/less/codemirror.less | 27 +-
notebook/static/notebook/less/commandpalette.less | 25 +
notebook/static/notebook/less/kernelselector.less | 4 +
notebook/static/notebook/less/menubar.less | 61 +
.../static/notebook/less/notificationarea.less | 18 +
notebook/static/notebook/less/renderedhtml.less | 7 +
notebook/static/notebook/less/savewidget.less | 11 +
notebook/static/notebook/less/toolbar.less | 3 +
notebook/static/tree/js/main.js | 6 +-
notebook/static/tree/js/notebooklist.js | 55 +-
notebook/static/tree/js/sessionlist.js | 8 +-
notebook/static/tree/less/tree.less | 51 +
notebook/templates/notebook.html | 2 +-
notebook/templates/page.html | 5 +-
notebook/terminal/api_handlers.py | 6 +-
notebook/tests/notebook/roundtrip.js | 15 +-
notebook/tests/test_files.py | 2 +-
notebook/tests/test_utils.py | 6 +-
notebook/utils.py | 7 +
package.json | 3 +-
setup.py | 2 +-
88 files changed, 4469 insertions(+), 270 deletions(-)
diff --cc debian/.git-dpm
index 39c3a9c,0000000..3e7186e
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
- 381389a7031ddec3113646dd9fd9ca0f2f9fc716
- 381389a7031ddec3113646dd9fd9ca0f2f9fc716
- 011fc69ecbd29b048567dcf974167c5a927e3598
++6c3e5d02a6ae5acfeddfcc994bf5feb0e078bcb1
++6c3e5d02a6ae5acfeddfcc994bf5feb0e078bcb1
++2d11329b4c2d8c690d320bfe7a7cf98c12d84b1b
+2d11329b4c2d8c690d320bfe7a7cf98c12d84b1b
+jupyter-notebook_5.2.1.orig.tar.gz
+11aa557251c85ffaa52d0b79204ee4eef5e22d3c
+5662374
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Nodejs-binary-and-import-names.patch
index 43cc180,0000000..a87be57
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 5f3532fd75d7df9a3f046f3a2760d9618e4ed010 Mon Sep 17 00:00:00 2001
++From 204e0f880e1c4c1301baea38152ecc32c3b065cf 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 9dc7c60..e52e1e3 100644
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -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 48fcabe,0000000..3bbb034
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,22 -1,0 +1,22 @@@
- From 27916bab427e8efca27e4d384c2bf29971eeb438 Mon Sep 17 00:00:00 2001
++From a02fd57228ac13d3dda7f4c3fe91d81d6739f170 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 0362a41..692fc68 100644
++index b8249a8..8c8cd79 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
- @@ -343,6 +343,8 @@ intersphinx_mapping = {
++@@ -350,6 +350,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 01a1128,0000000..cbe023c
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 180545ab46d359ec05da2ca23e2282c5dfdde644 Mon Sep 17 00:00:00 2001
++From 6d06a3779889ea2fb4175829ef2c9c817d3e246e 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
++index 1bab382..124eb26 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 5f95bc5,0000000..5fae200
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 3c892da105b000ad263742c97f3a26ad69780796 Mon Sep 17 00:00:00 2001
++From 98acd2d5d01af3371a1317b614d5d0f58a14ec8a 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 7665bb4..b431dd1 100644
++index 1373e56..9206418 100644
+--- a/notebook/templates/page.html
++++ b/notebook/templates/page.html
- @@ -69,7 +69,6 @@
++@@ -72,7 +72,6 @@
+ },
+ "jquery-ui": {
+ deps: ["jquery"],
+- exports: "$"
+ }
+ },
+ waitSeconds: 30,
+diff --git a/tools/build-main.js b/tools/build-main.js
+index 44b12a3..37f74cb 100644
+--- a/tools/build-main.js
++++ b/tools/build-main.js
+@@ -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 09d059b,0000000..67b3ab5
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 a3525340ba675a8b6ae223e8002b3bc33f743c46 Mon Sep 17 00:00:00 2001
++From eb551c0ad59bd953599b865d546281f62eac7229 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 e52e1e3..02bbc7a 100644
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -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 f4fe5af,0000000..4579da4
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 e7062bf4a3aa3d956b0f77de0637dcfc1d50855b Mon Sep 17 00:00:00 2001
++From 0b9536b3350ca769d8c756c595b6567ded288478 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 02bbc7a..c9945f4 100644
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -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 99b13f9,0000000..441d0cb
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 15e7289b8afb8f3c2f2ddda0601b115bda7ad30a Mon Sep 17 00:00:00 2001
++From 63a5840d2bad7d4300be2891212836233abf0175 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
++index 124eb26..cac3407 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 22f7b9d,0000000..0c6c997
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,18 -1,0 +1,18 @@@
- From 381389a7031ddec3113646dd9fd9ca0f2f9fc716 Mon Sep 17 00:00:00 2001
++From 6c3e5d02a6ae5acfeddfcc994bf5feb0e078bcb1 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 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 692fc68..8cbe5fb 100644
++index 8c8cd79..3172ffc 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
- @@ -350,3 +350,4 @@ spelling_word_list_filename='spelling_wordlist.txt'
++@@ -357,3 +357,4 @@ 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