Skip to content

Commit b851bc5

Browse files
committed
Move bqplot JavaScript into a separate node module
1 parent 9935585 commit b851bc5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+140
-393
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ _templates/
4444
# Jupyter notebook checkpoints
4545
.ipynb_checkpoints/
4646

47-
# Bower components
48-
bqplot/nbextension/components/
47+
# Compiled javascript
48+
bqplot/static/
4949

5050
# Node modules
5151
node_modules

.npmignore

-30
This file was deleted.

MANIFEST.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
recursive-include bqplot/nbextension *.*
2-
recursive-exclude bqplot/nbextension .git
1+
recursive-include bqplot/static *.*
32
include bqplot/*.json
4-
include bower.json

bower.json

-9
This file was deleted.

bqplot/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
def _jupyter_nbextension_paths():
7070
return [{
7171
'section': 'notebook',
72-
'src': 'nbextension',
72+
'src': 'static',
7373
'dest': 'bqplot',
7474
'require': 'bqplot/index'
7575
}]

bqplot/index.js

-92
This file was deleted.

bqplot/testing/__init__.py

-14
This file was deleted.

bqplot/testing/__main__.py

-17
This file was deleted.

bqplot/testing/testcontroller.py

-60
This file was deleted.

bqplot/testing/tests/test_sample.js

-19
This file was deleted.

js/package.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "bqplot",
3+
"version": "0.5.0dev",
4+
"description": "bqplot",
5+
"author": "BQPlot Development team",
6+
"license": "Apache-2.0",
7+
"main": "bqplot/index.js",
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/bloomberg/bqplot.git"
11+
},
12+
"scripts": {
13+
"prepublish": "webpack",
14+
"test": "echo \"Error: no test specified\" && exit 1"
15+
},
16+
"devDependencies": {
17+
"css-loader": "^0.23.1",
18+
"file-loader": "^0.8.5",
19+
"imports-loader": "^0.6.5",
20+
"json-loader": "^0.5.4",
21+
"less": "^2.6.1",
22+
"less-loader": "^2.2.3",
23+
"rimraf": "^2.4.1",
24+
"style-loader": "^0.13.1",
25+
"webpack": "^1.12.14"
26+
},
27+
"dependencies": {
28+
"bootstrap": "^3.3.5",
29+
"d3": "^3.5.16",
30+
"jquery": "^2.1.4",
31+
"jupyter-js-widgets": "0.0.15",
32+
"require-less": "*",
33+
"topojson": "^1.6.24",
34+
"underscore": "^1.8.3"
35+
}
36+
}

bqplot/nbextension/Axis.js js/src/Axis.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
Math.log10 = Math.log10 || function (x) { return Math.log(x) / Math.LN10; };
1919

20-
define(["jupyter-js-widgets", "./components/d3/d3", "./utils", "underscore"],
20+
define(["jupyter-js-widgets", "d3", "./utils", "underscore"],
2121
function(widgets, d3, bqutils, _) {
2222
"use strict";
2323

bqplot/nbextension/AxisModel.js js/src/AxisModel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["jupyter-js-widgets", "./components/d3/d3", "./BaseModel", "underscore"],
16+
define(["jupyter-js-widgets", "d3", "./BaseModel", "underscore"],
1717
function(widgets, d3, BaseModel, _) {
1818
"use strict";
1919

bqplot/nbextension/Bars.js js/src/Bars.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./Mark", "./utils", "underscore"],
16+
define(["d3", "./Mark", "./utils", "underscore"],
1717
function(d3, MarkViewModule, utils, _) {
1818
"use strict";
1919

bqplot/nbextension/BarsModel.js js/src/BarsModel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./MarkModel", "underscore"], function(d3, MarkModel, _) {
16+
define(["d3", "./MarkModel", "underscore"], function(d3, MarkModel, _) {
1717
"use strict";
1818

1919
var BarsModel = MarkModel.MarkModel.extend({
File renamed without changes.

bqplot/nbextension/Boxplot.js js/src/Boxplot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./Mark", "underscore"], function(d3, MarkViewModule, _) {
16+
define(["d3", "./Mark", "underscore"], function(d3, MarkViewModule, _) {
1717
"use strict";
1818
var Boxplot = MarkViewModule.Mark.extend({
1919
render: function() {

bqplot/nbextension/BoxplotModel.js js/src/BoxplotModel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./MarkModel", "underscore"], function(d3, MarkModel, _) {
16+
define(["d3", "./MarkModel", "underscore"], function(d3, MarkModel, _) {
1717
"use strict";
1818

1919
var BoxplotModel = MarkModel.MarkModel.extend({

bqplot/nbextension/BrushSelector.js js/src/BrushSelector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./Selector", "./utils", "underscore"], function(d3, BaseSelectors, utils, _) {
16+
define(["d3", "./Selector", "./utils", "underscore"], function(d3, BaseSelectors, utils, _) {
1717
"use strict";
1818

1919
var BrushSelector = BaseSelectors.BaseXYSelector.extend({

bqplot/nbextension/ColorAxis.js js/src/ColorAxis.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./utils", "./ColorUtils", "./Axis", "underscore"],
16+
define(["d3", "./utils", "./ColorUtils", "./Axis", "underscore"],
1717
function(d3, utils, Col_Pic, AxisViewModule, _) {
1818
"use strict";
1919

bqplot/nbextension/ColorScale.js js/src/ColorScale.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
define(["./components/d3/d3", "./Scale", "./ColorUtils", "underscore"],
16+
define(["d3", "./Scale", "./ColorUtils", "underscore"],
1717
function(d3, ScaleViewModule, ColorUtils, _) {
1818
"use strict";
1919

0 commit comments

Comments
 (0)