Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
kanitw committed Oct 18, 2015
2 parents 6defff5 + eb09ff6 commit 53a20e4
Show file tree
Hide file tree
Showing 78 changed files with 33,534 additions and 1,173 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ vega-lite*.map
spec.json
npm-debug.log
instance.json
coverage
coverage
8 changes: 8 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
test/log
test/log/difflist.json
node_modules
bower_components
data
editor
gallery
index.html
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ node_js:
before_install:
- npm install -g gulp
install: npm install
after_success: ./node_modules/.bin/coveralls --verbose < coverage/lcov.info
notifications:
email:
on_success: never
on_failure: change
slack:
slack:
rooms:
- 'uwdub:Ry6mwlUX1aZevqiqmYLiA3N1'
on_success: change
on_failure: always
on_success: never
on_failure: change
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
[![Build Status](https://travis-ci.org/vega/vega-lite.svg)](https://travis-ci.org/vega/vega-lite)
[![npm dependencies](https://david-dm.org/vega/vega-lite.svg)](https://www.npmjs.com/package/vega-lite)
[![npm version](https://img.shields.io/npm/v/vega-lite.svg)](https://www.npmjs.com/package/vega-lite)
[![Coverage Status](https://coveralls.io/repos/vega/vega-lite/badge.svg)](https://coveralls.io/r/vega/vega-lite)


**Vega-lite is still in alpha phase and we are working on improving the code and [documentation](Documentation).
Note that our syntax might change slightly before we release 1.0.**
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vega-lite",
"main": "vega-lite.js",
"version": "0.7.18",
"version": "0.8.0",
"homepage": "https://github.com/vega/vega-lite",
"authors": [
"Kanit Wongsuphasawat <kanitw@gmail.com> (http://kanitw.yellowpigz.com)",
Expand Down
Binary file added data/7zip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions data/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# vega-datasets

This data lives at https://github.com/vega/vega-datasets

Common repository for example datasets used by vega related projects. Keep changes to this repository minimal as other projects (vega, vega-editor, vega-lite, polestar, voyager) use this data in their tests and for examples.

## How to use it

Use git subtree to add these datasets to a project. Add data git `subtree add` like:

```
git subtree add --prefix path-to-data git@github.com:vega/vega-datasets.git gh-pages
```

Update to the latest version of vega-data with

```
git subtree pull --prefix path-to-data git@github.com:vega/vega-datasets.git gh-pages
```

You can also get the data directly via HTTP served by Github like:

https://vega.github.io/vega-datasets/cars.json

## Changelog

### Version 1.0, October 8, 2015

* Initial import from vega and vega-lite
* Change field names in `cars.json` to be more descriptive (`hp` to `Horsepower`)
3,377 changes: 3,377 additions & 0 deletions data/airports.csv

Large diffs are not rendered by default.

Loading

0 comments on commit 53a20e4

Please sign in to comment.