Skip to content

Commit

Permalink
Merge branch 'vega:master' into issue_4680
Browse files Browse the repository at this point in the history
  • Loading branch information
RobinL committed Dec 8, 2021
2 parents 593465e + 6299dd8 commit 5aeed00
Show file tree
Hide file tree
Showing 639 changed files with 11,922 additions and 6,521 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:
with:
token: ${{ secrets.GH_PAT || github.token }}

- name: Setup Node
uses: actions/setup-node@v2.5.0
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

Expand Down Expand Up @@ -55,6 +60,11 @@ jobs:
with:
token: ${{ secrets.GH_PAT || github.token }}

- name: Setup Node
uses: actions/setup-node@v2.5.0
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Check NPM deployment
run: ./scripts/check-npm.sh

- uses: actions/setup-node@v2.3.0
- uses: actions/setup-node@v2.5.0
with:
registry-url: 'https://registry.npmjs.org'
- name: Publish to NPM registry
Expand Down
29 changes: 22 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ jobs:
test-matrix:
name: Node
runs-on: ubuntu-latest
strategy:
matrix:
node: [12, 14, 15]

steps:
- uses: actions/checkout@v2

- name: Setup Node ${{ matrix.node }}
uses: actions/setup-node@v2.3.0
- name: Setup Node
uses: actions/setup-node@v2.5.0
with:
node-version: ${{ matrix.node }}
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand All @@ -41,6 +38,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Node
uses: actions/setup-node@v2.5.0
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

Expand All @@ -57,12 +59,20 @@ jobs:
- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Setup Node
uses: actions/setup-node@v2.5.0
with:
cache: 'yarn'

- name: Install extra dependencies for Puppeteer
run: sudo apt-get install libgbm1

- name: Build
run: yarn build:only

- name: Typechecks
run: yarn tsc

- name: Lint
run: yarn lint

Expand All @@ -73,7 +83,7 @@ jobs:
run: yarn jest test/ --collectCoverage=true

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v2.0.2
uses: codecov/codecov-action@v2.1.0

test-cli:
name: CLI
Expand All @@ -88,6 +98,11 @@ jobs:
- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Setup Node
uses: actions/setup-node@v2.5.0
with:
cache: 'yarn'

- name: Build
run: yarn build:only

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Read about future plans in [our roadmap](https://github.com/vega/roadmap/project

## Team

The development of Vega-Lite is led by the alumni and members of the [University of Washington Interactive Data Lab](https://idl.cs.washington.edu) (UW IDL), including [Kanit "Ham" Wongsuphasawat](https://twitter.com/kanitw) (now at Apple), [Dominik Moritz](https://twitter.com/domoritz) (now at CMU and Apple), [Arvind Satyanarayan](https://twitter.com/arvindsatya1) (now at MIT), and [Jeffrey Heer](https://twitter.com/jeffrey_heer) (UW IDL).
The development of Vega-Lite is led by the alumni and members of the [University of Washington Interactive Data Lab](https://idl.cs.washington.edu) (UW IDL), including [Kanit "Ham" Wongsuphasawat](https://twitter.com/kanitw) (now at Databricks), [Dominik Moritz](https://twitter.com/domoritz) (now at CMU and Apple), [Arvind Satyanarayan](https://twitter.com/arvindsatya1) (now at MIT), and [Jeffrey Heer](https://twitter.com/jeffrey_heer) (UW IDL).

Vega-Lite gets significant contributions from its community--in particular [Will Strimling](https://willium.com), [Yuhan (Zoe) Lu](https://github.com/YuhanLu), [Souvik Sen](https://github.com/invokesus), [Chanwut Kittivorawong](https://github.com/chanwutk), [Matthew Chun](https://github.com/mattwchun), [Akshat Shrivastava](https://github.com/AkshatSh), [Saba Noorassa](https://github.com/Saba9), [Sira Horradarn](https://github.com/sirahd), [Donghao Ren](https://github.com/donghaoren), and [Halden Lin](https://github.com/haldenl). Please see the [contributors page](https://github.com/vega/vega-lite/graphs/contributors) for the full list of contributors.

Expand Down
742 changes: 669 additions & 73 deletions build/vega-lite-schema.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/compiled/airport_connections.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions examples/compiled/airport_connections.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"padding": 5,
"width": 900,
"height": 500,
"style": "cell",
"data": [
{"name": "org_store"},
{
Expand Down Expand Up @@ -201,7 +200,7 @@
"opacity": {"value": 0.35},
"stroke": {"value": "#000"},
"description": {
"signal": "\"latitude: \" + (format(datum[\"latitude\"], \"\")) + \"; longitude: \" + (format(datum[\"longitude\"], \"\")) + \"; lat2: \" + (format(datum[\"lat2\"], \"\")) + \"; lon2: \" + (format(datum[\"lon2\"], \"\"))"
"signal": "\"longitude: \" + (format(datum[\"longitude\"], \"\")) + \"; lon2: \" + (format(datum[\"lon2\"], \"\")) + \"; latitude: \" + (format(datum[\"latitude\"], \"\")) + \"; lat2: \" + (format(datum[\"lat2\"], \"\"))"
},
"x": {"field": "layer_1_x"},
"x2": {"field": "layer_1_x2"},
Expand All @@ -223,7 +222,7 @@
"fill": {"value": "#4c78a8"},
"ariaRoleDescription": {"value": "circle"},
"description": {
"signal": "\"latitude: \" + (format(datum[\"latitude\"], \"\")) + \"; longitude: \" + (format(datum[\"longitude\"], \"\")) + \"; routes: \" + (format(datum[\"routes\"], \"\"))"
"signal": "\"longitude: \" + (format(datum[\"longitude\"], \"\")) + \"; latitude: \" + (format(datum[\"latitude\"], \"\")) + \"; routes: \" + (format(datum[\"routes\"], \"\"))"
},
"x": {"field": "layer_2_x"},
"y": {"field": "layer_2_y"},
Expand Down Expand Up @@ -263,6 +262,5 @@
"range": [0, 1000],
"zero": true
}
],
"config": {"style": {"cell": {"stroke": null}}}
]
}
2 changes: 0 additions & 2 deletions examples/compiled/arc_donut.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"padding": 5,
"width": 200,
"height": 200,
"style": "cell",
"encode": {"update": {"stroke": {"value": null}}},
"data": [
{
"name": "source_0",
Expand Down
Binary file added examples/compiled/arc_facet.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions examples/compiled/arc_facet.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5aeed00

Please sign in to comment.