[Python-modules-commits] [jupyter-notebook] 12/13: merge patched into master

Gordon Ball chronitis-guest at moszumanska.debian.org
Fri Dec 1 11:22:09 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 180217023a3c82eb7d44c5ce5d1c9951dbf586e6
Merge: a4ca199 aa425cb
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Dec 1 11:07:12 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  6 +-
 .../0001-Nodejs-binary-and-import-names.patch      |  2 +-
 .../0002-Use-local-MathJax-in-documentation.patch  |  2 +-
 ...ptools-in-setup.py-so-dependencies-are-de.patch |  2 +-
 ...0004-jquery-ui-1.12-compatibility-changes.patch |  2 +-
 ...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 |  2 +-
 ...rs-in-documentation-notebooks-during-buil.patch |  2 +-
 .../0009-Add-requirejs-shim-for-xterm.patch        |  2 +-
 docs/source/changelog.rst                          | 73 ++++++++++++++++++----
 notebook/_version.py                               |  2 +-
 notebook/auth/login.py                             |  1 +
 notebook/base/handlers.py                          | 12 +++-
 notebook/static/base/js/namespace.js               |  2 +-
 15 files changed, 86 insertions(+), 28 deletions(-)

diff --cc debian/.git-dpm
index 0f0a019,0000000..44a7b5e
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
- a67cb72d067f60ea5588afc8e729246090a84ff3
- a67cb72d067f60ea5588afc8e729246090a84ff3
- 2d11329b4c2d8c690d320bfe7a7cf98c12d84b1b
++aa425cb8596dee8298a16d73678ea4c43d0c1456
++aa425cb8596dee8298a16d73678ea4c43d0c1456
++a41a93e06f85a5c6b50ca0be163206b30175f79e
 +a41a93e06f85a5c6b50ca0be163206b30175f79e
 +jupyter-notebook_5.2.2.orig.tar.gz
 +65610c3c1353a4af6d4ac335a1a0653296a1e3d0
 +5662843
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Nodejs-binary-and-import-names.patch
index a87be57,0000000..2f71749
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 204e0f880e1c4c1301baea38152ecc32c3b065cf Mon Sep 17 00:00:00 2001
++From 05b48c446177d663a9efe5a102fdd3d183ad90a3 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 3bbb034,0000000..483a98c
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 a02fd57228ac13d3dda7f4c3fe91d81d6739f170 Mon Sep 17 00:00:00 2001
++From 79d67740d802cace83430a808dbe14705f010466 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 b8249a8..8c8cd79 100644
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
 +@@ -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 cbe023c,0000000..d620219
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 6d06a3779889ea2fb4175829ef2c9c817d3e246e Mon Sep 17 00:00:00 2001
++From f2f124cd436a4630bf08d2138e2e5bcbb7440d2d 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 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 5fae200,0000000..61cd3c4
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 98acd2d5d01af3371a1317b614d5d0f58a14ec8a Mon Sep 17 00:00:00 2001
++From 572848e108080996ef31a6fedc2f5beb5c031dcd 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 1373e56..9206418 100644
 +--- a/notebook/templates/page.html
 ++++ b/notebook/templates/page.html
 +@@ -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 67b3ab5,0000000..f282fe1
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 eb551c0ad59bd953599b865d546281f62eac7229 Mon Sep 17 00:00:00 2001
++From 814399566f9d8ee40b998fda8a3243219e9b661d 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 4579da4,0000000..e054991
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 0b9536b3350ca769d8c756c595b6567ded288478 Mon Sep 17 00:00:00 2001
++From 9fda12243d8a7decb0c717805a01c847f35796de 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 441d0cb,0000000..a99c1c2
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 63a5840d2bad7d4300be2891212836233abf0175 Mon Sep 17 00:00:00 2001
++From 36a55d27125c6c4b3df593507f1b197a6b5cbfe5 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 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 0c6c997,0000000..5dab650
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 6c3e5d02a6ae5acfeddfcc994bf5feb0e078bcb1 Mon Sep 17 00:00:00 2001
++From 3aaadf817cea1cd818fb072f7e330cfe273c0335 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 8c8cd79..3172ffc 100644
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
 +@@ -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
diff --cc debian/patches/0009-Add-requirejs-shim-for-xterm.patch
index 5da668b,0000000..7feabcc
mode 100644,000000..100644
--- a/debian/patches/0009-Add-requirejs-shim-for-xterm.patch
+++ b/debian/patches/0009-Add-requirejs-shim-for-xterm.patch
@@@ -1,26 -1,0 +1,26 @@@
- From a67cb72d067f60ea5588afc8e729246090a84ff3 Mon Sep 17 00:00:00 2001
++From aa425cb8596dee8298a16d73678ea4c43d0c1456 Mon Sep 17 00:00:00 2001
 +From: Gordon Ball <gordon at chronitis.net>
 +Date: Sun, 19 Nov 2017 15:28:09 +0000
 +Subject: Add requirejs shim for xterm
 +
 +The xtermjs package (as of 2.7.0+ds1-1) doesn't appear to export an
 +object, AMD-style. This adds a shim to retrieve `window.Terminal` so
 +that `require(["xterm"], ...)` will hopefully work.
 +---
 + tools/build-main.js | 3 +++
 + 1 file changed, 3 insertions(+)
 +
 +diff --git a/tools/build-main.js b/tools/build-main.js
 +index 37f74cb..b800749 100644
 +--- a/tools/build-main.js
 ++++ b/tools/build-main.js
 +@@ -57,6 +57,9 @@ var rjs_config = {
 +     "jquery-ui": {
 +       deps: ["jquery"],
 +     },
 ++    xterm: {
 ++      exports: "Terminal"
 ++    },
 +   },
 + 
 +   exclude: [

-- 
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