Skip to content

Commit

Permalink
Merge pull request #11 from fredo-dedup/devl
Browse files Browse the repository at this point in the history
Devl
  • Loading branch information
fredo-dedup committed Mar 6, 2017
2 parents cefe12c + 051b56d commit c46bc8d
Show file tree
Hide file tree
Showing 287 changed files with 18,311 additions and 8,249 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docs/build/
docs/site/
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ script:
- julia --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.build("VegaLite"); Pkg.test("VegaLite"; coverage=true)'
after_success:
- julia -e 'cd(Pkg.dir("VegaLite")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'Pkg.add("Documenter")'
- julia -e 'cd(Pkg.dir("VegaLite")); include(joinpath("docs", "make.jl"))'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _Julia bindings to Vega-Lite_

|Julia 0.4 | Julia 0.5 | master (on nightly + release) | Coverage |
|:--------:|:---------:|:-----------------------------:|:-----------:|
|[![VegaLite](http://pkg.julialang.org/badges/VegaLite_0.4.svg)](http://pkg.julialang.org/?pkg=VegaLite&ver=0.4) | N/A | [![Build Status](https://travis-ci.org/fredo-dedup/VegaLite.jl.svg?branch=master)](https://travis-ci.org/fredo-dedup/VegaLite.jl) | [![Coverage Status](https://coveralls.io/repos/github/fredo-dedup/VegaLite.jl/badge.svg?branch=master)](https://coveralls.io/github/fredo-dedup/VegaLite.jl?branch=master) |
|[![VegaLite](http://pkg.julialang.org/badges/VegaLite_0.4.svg)](http://pkg.julialang.org/?pkg=VegaLite&ver=0.4) | [![VegaLite](http://pkg.julialang.org/badges/VegaLite_0.5.svg)](http://pkg.julialang.org/?pkg=VegaLite&ver=0.5) | [![Build Status](https://travis-ci.org/fredo-dedup/VegaLite.jl.svg?branch=master)](https://travis-ci.org/fredo-dedup/VegaLite.jl) | [![Coverage Status](https://coveralls.io/repos/github/fredo-dedup/VegaLite.jl/badge.svg?branch=master)](https://coveralls.io/github/fredo-dedup/VegaLite.jl?branch=master) |


This package provides access to the Vega-Lite high-level visualization grammar (http://vega.github.io/vega-lite/) from Julia.
Expand Down
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
julia 0.4
Compat
JSON
Requires
8 changes: 8 additions & 0 deletions TODO.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- buttons : not working in Escher - DONE
- Find out how to require vega-embed in Jupyter, this is preventing the svg and buttons flag to function (currently hardwired to true and false resp.)
- use CSS to separate actions buttons (see vega-lite site) - DONE
- how to change the font of axes ? with CSS ?
- finish implementation (transform, bin, ), check against schema spec
- try to have it work on JUNO, hint : check Base.Multimedia.displays to know where we are displaying html - DONE
- explain better the behaviour for each backend. Mention the need to push!(window.assets, ("VegaLite", "vega-lite-plot"))
- ....
10 changes: 5 additions & 5 deletions assets/bower_components/d3/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"license": "BSD-3-Clause",
"ignore": [],
"homepage": "https://github.com/mbostock-bower/d3-bower",
"version": "3.5.16",
"_release": "3.5.16",
"version": "3.5.17",
"_release": "3.5.17",
"_resolution": {
"type": "version",
"tag": "v3.5.16",
"commit": "f541593777ebe842059fda09d3ce1b6de8b29a7d"
"tag": "v3.5.17",
"commit": "abe0262a205c9f3755c3a757de4dfd1d49f34b24"
},
"_source": "git://github.com/mbostock-bower/d3-bower.git",
"_source": "https://github.com/mbostock-bower/d3-bower.git",
"_target": "^3.5.6",
"_originalSource": "d3"
}
4 changes: 4 additions & 0 deletions assets/bower_components/d3/.directory
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Dolphin]
Timestamp=2016,9,6,22,24,25
Version=3
ViewMode=1
4 changes: 4 additions & 0 deletions assets/bower_components/d3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
Want to learn more? [See the wiki.](https://github.com/mbostock/d3/wiki)

For examples, [see the gallery](https://github.com/mbostock/d3/wiki/Gallery) and [mbostock’s bl.ocks](http://bl.ocks.org/mbostock).

## Good News, Everyone!

The next major release of D3, 4.0, is coming! See the [4.0 development branch](https://github.com/mbostock/d3/tree/4) and read the [new API reference](https://github.com/mbostock/d3/blob/4/README.md) to get ready.
4 changes: 2 additions & 2 deletions assets/bower_components/d3/d3.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!function() {
var d3 = {
version: "3.5.16"
version: "3.5.17"
};
var d3_arraySlice = [].slice, d3_array = function(list) {
return d3_arraySlice.call(list);
Expand Down Expand Up @@ -3525,7 +3525,7 @@
λ0 = λ, sinφ0 = sinφ, cosφ0 = cosφ, point0 = point;
}
}
return (polarAngle < -ε || polarAngle < ε && d3_geo_areaRingSum < 0) ^ winding & 1;
return (polarAngle < -ε || polarAngle < ε && d3_geo_areaRingSum < -ε) ^ winding & 1;
}
function d3_geo_clipCircle(radius) {
var cr = Math.cos(radius), smallRadius = cr > 0, notHemisphere = abs(cr) > ε, interpolate = d3_geo_circleInterpolate(radius, 6 * d3_radians);
Expand Down
10 changes: 5 additions & 5 deletions assets/bower_components/d3/d3.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions assets/bower_components/vega-embed/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
"src",
"test"
],
"version": "2.1.0",
"_release": "2.1.0",
"version": "2.2.0",
"_release": "2.2.0",
"_resolution": {
"type": "version",
"tag": "v2.1.0",
"commit": "18cf2dcaaa274b6311c15a7800d166d6c01b257e"
"tag": "v2.2.0",
"commit": "06c7a2956014e0ebdae7b0af5bb39131c08bf353"
},
"_source": "git://github.com/vega/vega-embed.git",
"_target": "^2.1.0",
"_source": "https://github.com/vega/vega-embed.git",
"_target": "^2.2.0",
"_originalSource": "vega-embed",
"_direct": true
}
19 changes: 12 additions & 7 deletions assets/bower_components/vega-embed/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vega-embed",
"version": "2.1.0",
"version": "2.2.0",
"description": "Publish Vega visualizations as embedded web components.",
"keywords": [
"vega",
Expand All @@ -17,21 +17,26 @@
"name": "Jeffrey Heer",
"url": "http://idl.cs.washington.edu"
},
"contributors": [{
"name": "Arvind Satyanarayan",
"url": "http://arvindsatya.com"
}],
"license": "BSD-3-Clause",
"main": "src/embed.js",
"devDependencies": {
"d3": "^3.5.16",
"d3-geo-projection": "^0.2.16",
"topojson": "^1.6.24",
"vega": "^2.5.0",
"vega-lite": "^1.0.7",
"browserify": "^13.0.0",
"browserify-shim": "^3.8.12",
"chai": "^3.5.0",
"d3": "^3.5.16",
"d3-geo-projection": "^0.2.16",
"jshint": "^2.9.1",
"mocha": "^2.4.5",
"topojson": "^1.6.24",
"tv4": "^1.2.7",
"uglify-js": "^2.6.2"
"uglify-js": "^2.6.2",
"vega": "^2.5.0",
"vega-lite": "^1.0.7",
"watchify": "^3.7.0"
},
"scripts": {
"deploy": "npm run lint && npm run test && scripts/deploy.sh",
Expand Down
30 changes: 30 additions & 0 deletions assets/bower_components/vega-embed/vega-embed-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
"vega-lite"
]
},
"config": {
"oneOf": [
{
"type": "string"
},
{
"type": "object"
}
]
},
"actions": {
"oneOf": [
{
Expand Down Expand Up @@ -78,6 +88,16 @@
"vega-lite"
]
},
"config": {
"oneOf": [
{
"type": "string"
},
{
"type": "object"
}
]
},
"actions": {
"oneOf": [
{
Expand Down Expand Up @@ -129,6 +149,16 @@
"vega-lite"
]
},
"config": {
"oneOf": [
{
"type": "string"
},
{
"type": "object"
}
]
},
"actions": {
"oneOf": [
{
Expand Down
28 changes: 21 additions & 7 deletions assets/bower_components/vega-embed/vega-embed.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/bower_components/vega-embed/vega-embed.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions assets/bower_components/vega-lite/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@
"example/_diff/*"
],
"dependencies": {
"vega": "^2.5.0"
"vega": "^2.6.0"
},
"devDependencies": {
"vega-embed": "~2.0.0",
"d3": "~3.5.14",
"highlightjs": "~9.1.0",
"octicons": "^3.4.1"
"vega-embed": "~2.2.0",
"d3": "~3.5.16",
"highlightjs": "~9.4.0",
"octicons": "^4.2.0"
},
"version": "1.0.8",
"_release": "1.0.8",
"version": "1.2.0",
"_release": "1.2.0",
"_resolution": {
"type": "version",
"tag": "v1.0.8",
"commit": "2c15b60be406bf8ebbc1e2694d19586b8c855c5a"
"tag": "v1.2.0",
"commit": "284aa039ac6b5d154a3904321333f89001503c9a"
},
"_source": "git://github.com/uwdata/vega-lite.git",
"_target": "^1.0.8",
"_source": "https://github.com/uwdata/vega-lite.git",
"_target": "^1.2.0",
"_originalSource": "vega-lite",
"_direct": true
}

0 comments on commit c46bc8d

Please sign in to comment.