[Python-modules-commits] [python-mpld3] 06/06: merge patched into master
Wolfgang Borgert
debacle at moszumanska.debian.org
Sun Oct 11 22:08:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-mpld3.
commit f020af6dcad9bcf0ca7806d791a991804e0b467c
Merge: aabedbf ba51e86
Author: W. Martin Borgert <debacle at debian.org>
Date: Mon Oct 12 00:08:01 2015 +0200
merge patched into master
Makefile | 8 ++---
debian/.git-dpm | 4 +--
...le-fetching-of-git-submodule-during-build.patch | 37 +++++++++++++++++++
...2-use-nodejs-and-node-modules-from-Debian.patch | 36 +++++++++++++++++++
debian/patches/0003-use-packaged-mplexporter.patch | 42 ++++++++++++++++++++++
debian/patches/series | 3 ++
mpld3/_display.py | 2 +-
mpld3/mpld3renderer.py | 6 ++--
setup.py | 6 ++--
9 files changed, 130 insertions(+), 14 deletions(-)
diff --cc debian/.git-dpm
index c4aad72,0000000..559712e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 0d5b4b9ab52753cf91bb3a08612798362f71990d
- 0d5b4b9ab52753cf91bb3a08612798362f71990d
++ba51e865ec14d7b1534dd69194019eec48703996
++ba51e865ec14d7b1534dd69194019eec48703996
+0d5b4b9ab52753cf91bb3a08612798362f71990d
+0d5b4b9ab52753cf91bb3a08612798362f71990d
+python-mpld3_0.3git+20140910dfsg.orig.tar.gz
+06707741d647e40b46f235a92ec7d79f15997228
+800655
diff --cc debian/patches/0001-disable-fetching-of-git-submodule-during-build.patch
index 0000000,0000000..8f750a1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-disable-fetching-of-git-submodule-during-build.patch
@@@ -1,0 -1,0 +1,37 @@@
++From c74894d20ba25db87f27be713a7f30f520d98bee Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Mon, 12 Oct 2015 00:07:35 +0200
++Subject: disable fetching of git submodule during build
++
++Origin: vendor
++Last-Update: 2014-09-30
++---
++ setup.py | 6 ++----
++ 1 file changed, 2 insertions(+), 4 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index a257b33..85de505 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -23,7 +23,6 @@ VERSION = get_version()
++
++ # Make sure submodules are updated and synced
++ root_dir = os.path.abspath(os.path.dirname(__file__))
++-require_clean_submodules(root_dir, sys.argv)
++
++ # Warn if it looks like JS libs need to be built
++ if 'buildjs' not in sys.argv:
++@@ -41,11 +40,10 @@ setup(name=NAME,
++ url=URL,
++ download_url=DOWNLOAD_URL,
++ license=LICENSE,
++- cmdclass={'submodule': UpdateSubmodules,
+++ cmdclass={
++ 'buildjs': BuildJavascript},
++ packages=['mpld3',
++- 'mpld3/mplexporter',
++- 'mpld3/mplexporter/renderers'],
+++ ],
++ package_data={'mpld3': ['js/*.js']},
++ classifiers=[
++ 'Development Status :: 4 - Beta',
diff --cc debian/patches/0002-use-nodejs-and-node-modules-from-Debian.patch
index 0000000,0000000..242aec8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-use-nodejs-and-node-modules-from-Debian.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 8e7d3191c376a0bff5df3871a0249081d81e0389 Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Mon, 12 Oct 2015 00:07:40 +0200
++Subject: use nodejs and node modules from Debian
++
++Origin: vendor
++Last-Update: 2014-09-30
++---
++ Makefile | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/Makefile b/Makefile
++index 1bbe494..c7f3671 100644
++--- a/Makefile
+++++ b/Makefile
++@@ -13,16 +13,16 @@ test:
++ @npm test
++
++ src/version.js: mpld3/__about__.py
++- @node bin/version $(VERSION) > $@
+++ @nodejs bin/version $(VERSION) > $@
++
++-mpld3/js/mpld3.v$(VERSION).js: $(shell node_modules/.bin/smash --ignore-missing --list src/mpld3.js) package.json
+++mpld3/js/mpld3.v$(VERSION).js: $(shell smash --ignore-missing --list src/mpld3.js) package.json
++ @rm -f $@
++- node_modules/.bin/smash src/mpld3.js | node_modules/.bin/uglifyjs - -b indent-level=2 -o $@
+++ smash src/mpld3.js | uglifyjs -b --indent 2 -o $@
++ @chmod a-w $@
++
++ mpld3/js/mpld3.v$(VERSION).min.js: mpld3/js/mpld3.v$(VERSION).js bin/uglify
++ @rm -f $@
++- bin/uglify $< > $@
+++ uglifyjs $< > $@
++ @chmod a-w $@
++
++ clean:
diff --cc debian/patches/0003-use-packaged-mplexporter.patch
index 0000000,0000000..03e00bf
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-use-packaged-mplexporter.patch
@@@ -1,0 -1,0 +1,42 @@@
++From ba51e865ec14d7b1534dd69194019eec48703996 Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Mon, 12 Oct 2015 00:07:46 +0200
++Subject: use packaged mplexporter
++
++Origin: vendor
++Last-Update: 2014-09-30
++---
++ mpld3/_display.py | 2 +-
++ mpld3/mpld3renderer.py | 6 +++---
++ 2 files changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/mpld3/_display.py b/mpld3/_display.py
++index 1b090e0..8aeb437 100644
++--- a/mpld3/_display.py
+++++ b/mpld3/_display.py
++@@ -7,7 +7,7 @@ import re
++ import os
++ from ._server import serve_and_open
++ from .utils import deprecated, get_id, write_ipynb_local_js
++-from .mplexporter import Exporter
+++from mplexporter import Exporter
++ from .mpld3renderer import MPLD3Renderer
++ from . import urls
++
++diff --git a/mpld3/mpld3renderer.py b/mpld3/mpld3renderer.py
++index 725aa09..3dacaad 100644
++--- a/mpld3/mpld3renderer.py
+++++ b/mpld3/mpld3renderer.py
++@@ -13,9 +13,9 @@ import itertools
++
++ import numpy as np
++
++-from .mplexporter.utils import color_to_hex
++-from .mplexporter.exporter import Exporter
++-from .mplexporter.renderers import Renderer
+++from mplexporter.utils import color_to_hex
+++from mplexporter.exporter import Exporter
+++from mplexporter.renderers import Renderer
++
++ from .utils import get_id
++ from .plugins import get_plugins
diff --cc debian/patches/series
index 0000000,0000000..db33f9f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++0001-disable-fetching-of-git-submodule-during-build.patch
++0002-use-nodejs-and-node-modules-from-Debian.patch
++0003-use-packaged-mplexporter.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mpld3.git
More information about the Python-modules-commits
mailing list