[Python-modules-commits] [jupyter-notebook] 08/09: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Fri Dec 9 14:00:57 UTC 2016
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 7fafe91352b79143ce800d8cc7820f0875bbb317
Merge: 2e413c3 c2a64f5
Author: Gordon Ball <gordon at chronitis.net>
Date: Fri Dec 9 14:36:09 2016 +0100
merge patched into master
debian/.git-dpm | 4 ++--
.../0001-Nodejs-binary-and-import-names.patch | 21 +++------------------
.../0002-Use-local-MathJax-in-documentation.patch | 2 +-
...uptools-in-setup.py-so-dependencies-are-de.patch | 2 +-
.../0004-jquery-ui-1.12-compatibility-changes.patch | 4 ++--
...-with-source-map-basepath-option-for-repro.patch | 2 +-
...nd-https-github.com-less-less.js-pull-3002.patch | 2 +-
...cific-hack-to-fix-upstream-s-non-increment.patch | 2 +-
tools/build-main.js | 2 +-
9 files changed, 13 insertions(+), 28 deletions(-)
diff --cc debian/.git-dpm
index 1a79c23,0000000..dfdd9a8
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
- 0f0ba7049c33f16b250d1ff3f64dbd59754f01b5
- 0f0ba7049c33f16b250d1ff3f64dbd59754f01b5
++c2a64f5f74f916065305011fbeffd6f77ed08a7f
++c2a64f5f74f916065305011fbeffd6f77ed08a7f
+1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
+1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
+jupyter-notebook_4.2.3.orig.tar.gz
+cd42c2013047d2722d3990db4787820cff51cbc8
+4456566
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Nodejs-binary-and-import-names.patch
index a7518a9,0000000..c78742d
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,38 -1,0 +1,23 @@@
- From 10f494574090f1cd92304d3c5949951f7c34f09a Mon Sep 17 00:00:00 2001
++From 36b539fd60890cccf807b5e21a37fefdb3f130c4 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
- * Import requirejs -> r
+---
- setupbase.py | 2 +-
- tools/build-main.js | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ setupbase.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setupbase.py b/setupbase.py
+index 62d4e63..a411c9b 100644
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -476,7 +476,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 --git a/tools/build-main.js b/tools/build-main.js
- index bd0316b..3336159 100644
- --- a/tools/build-main.js
- +++ b/tools/build-main.js
- @@ -1,7 +1,7 @@
- // build main.min.js
- // spawned by gulp to allow parallelism
-
- -var rjs = require('requirejs').optimize;
- +var rjs = require('r').optimize;
-
- var name = process.argv[2];
-
diff --cc debian/patches/0002-Use-local-MathJax-in-documentation.patch
index 88ce1ec,0000000..46a6fcd
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,19 -1,0 +1,19 @@@
- From c1d77748a9887228746fe7467464ccec38cca8f5 Mon Sep 17 00:00:00 2001
++From 7050d33a3cbfd2b3b29481921035ff20898cb8e1 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 d32d0da..238a0c4 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -332,3 +332,5 @@ intersphinx_mapping = {
+ 'nbformat': ('http://nbformat.readthedocs.org/en/latest/', None),
+ 'jupyter': ('http://jupyter.readthedocs.org/en/latest/', None),
+ }
++
++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax/js?config=TeX-AMD-MML_HTMLorMML'
diff --cc debian/patches/0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
index 18ba4f2,0000000..d8bc886
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 4c4469cbcf4c59364f4bf116064e750159314f60 Mon Sep 17 00:00:00 2001
++From 8518175080c6ff2745e68893e8927db4d5d86cbc 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 9cd515a..2c27d58 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 8ffab0f,0000000..b866d70
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,82 -1,0 +1,82 @@@
- From 9b510df313b8367e9b8fe47a5946dcf2b5c5be7d Mon Sep 17 00:00:00 2001
++From 57e3571e4b6092f4144f6bd202071d837233ba1b 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/static/notebook/js/outputarea.js | 3 ++-
+ notebook/static/notebook/js/pager.js | 3 ++-
+ notebook/templates/page.html | 4 ----
+ tools/build-main.js | 1 -
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/notebook/static/notebook/js/outputarea.js b/notebook/static/notebook/js/outputarea.js
+index 97d9583..812d01d 100644
+--- a/notebook/static/notebook/js/outputarea.js
++++ b/notebook/static/notebook/js/outputarea.js
+@@ -2,13 +2,14 @@
+ // Distributed under the terms of the Modified BSD License.
+
+ define([
++ 'jquery',
+ 'jquery-ui',
+ 'base/js/utils',
+ 'base/js/security',
+ 'base/js/keyboard',
+ 'notebook/js/mathjaxutils',
+ 'components/marked/lib/marked',
+-], function($, utils, security, keyboard, mathjaxutils, marked) {
++], function($, ___, utils, security, keyboard, mathjaxutils, marked) {
+ "use strict";
+
+ /**
+diff --git a/notebook/static/notebook/js/pager.js b/notebook/static/notebook/js/pager.js
+index cb9bf32..172ad60 100644
+--- a/notebook/static/notebook/js/pager.js
++++ b/notebook/static/notebook/js/pager.js
+@@ -2,9 +2,10 @@
+ // Distributed under the terms of the Modified BSD License.
+
+ define([
++ 'jquery',
+ 'jquery-ui',
+ 'base/js/utils',
+-], function($, utils) {
++], function($, ___, utils) {
+ "use strict";
+
+ var Pager = function (pager_selector, options) {
+diff --git a/notebook/templates/page.html b/notebook/templates/page.html
+index 3e03e85..19f69bd 100644
+--- a/notebook/templates/page.html
++++ b/notebook/templates/page.html
+@@ -66,7 +66,6 @@
+ },
+ "jquery-ui": {
+ deps: ["jquery"],
+- exports: "$"
+ }
+ },
+ waitSeconds: 30,
+@@ -92,9 +91,6 @@
+ return window.$;
+ });
+
+- define("jquery-ui", function () {
+- return window.$;
+- });
+ // error-catching custom.js shim.
+ define("custom", function (require, exports, module) {
+ try {
+diff --git a/tools/build-main.js b/tools/build-main.js
- index 3336159..0f33034 100644
++index bd0316b..fa8db8a 100644
+--- a/tools/build-main.js
++++ b/tools/build-main.js
+@@ -53,7 +53,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 ee098a9,0000000..6b9ae53
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 39bdadbf346e8f77aed5d40dc0de9c30d0b7498b Mon Sep 17 00:00:00 2001
++From 707372e6789c144174f88c78840d22c10c69b133 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 a411c9b..6ad2e9b 100644
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -406,7 +406,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 fc73757,0000000..21d55e7
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 529a67483a53ac55be58c46d9864e86d733cd113 Mon Sep 17 00:00:00 2001
++From 6c315c6c7064ac049cd661ff88e42a74fb5901eb 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 6ad2e9b..e1a8938 100644
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -409,7 +409,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 0fc8297,0000000..1dbade4
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 0f0ba7049c33f16b250d1ff3f64dbd59754f01b5 Mon Sep 17 00:00:00 2001
++From c2a64f5f74f916065305011fbeffd6f77ed08a7f 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 2c27d58..f9dd7ab 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,
++ }
+
+
+
--
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