Skip to content

Commit

Permalink
Merge branch 'main' into pr/JessamineQ/9305
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed May 1, 2024
2 parents fa09820 + a573af5 commit 622762d
Show file tree
Hide file tree
Showing 68 changed files with 2,825 additions and 1,500 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-docs-and-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down Expand Up @@ -62,10 +62,10 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand All @@ -68,16 +68,18 @@ jobs:
run: yarn jest test/ --collectCoverage=true

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.1.0
uses: codecov/codecov-action@v4.1.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

test-cli:
name: CLI
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
Expand All @@ -86,7 +88,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@


# [5.18.0](https://github.com/vega/vega-lite/compare/v5.17.0...v5.18.0) (2024-04-09)


### Bug Fixes

* **#8338,#8126:** make boxplot work with single value per group ([#8339](https://github.com/vega/vega-lite/issues/8339)) ([4e55836](https://github.com/vega/vega-lite/commit/4e558369eecc5d84fbccd0fd2bc84be19f5f5e35)), closes [#8338](https://github.com/vega/vega-lite/issues/8338) [#8126](https://github.com/vega/vega-lite/issues/8126) [#8338](https://github.com/vega/vega-lite/issues/8338) [#8126](https://github.com/vega/vega-lite/issues/8126)
* describe how to set a custom scheme by setting the range, reverts [#9262](https://github.com/vega/vega-lite/issues/9262) ([#9266](https://github.com/vega/vega-lite/issues/9266)) ([e6af641](https://github.com/vega/vega-lite/commit/e6af6414431ade1f52359ad682ffc1f4f4a667c3)), closes [#9022](https://github.com/vega/vega-lite/issues/9022)
* generate unescaped boxplot calculated field aliases ([#9284](https://github.com/vega/vega-lite/issues/9284)) ([44fbceb](https://github.com/vega/vega-lite/commit/44fbceb0120ee54a8989cb1537537757adac8c58))


### Features

* add explicit option to control how densities are resolved, change how densities are resolved by default ([#9172](https://github.com/vega/vega-lite/issues/9172)) ([bf0b8d3](https://github.com/vega/vega-lite/commit/bf0b8d3e2c80dc1d28cd3c6c4e764ea2ed714d6c))

# [5.17.0](https://github.com/vega/vega-lite/compare/v5.16.3...v5.17.0) (2024-03-12)


Expand Down
16 changes: 9 additions & 7 deletions build/vega-lite-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -8145,6 +8145,14 @@
"description": "The minimum number of samples to take along the extent domain for plotting the density.\n\n__Default value:__ `25`",
"type": "number"
},
"resolve": {
"description": "Indicates how parameters for multiple densities should be resolved. If `\"independent\"`, each density may have its own domain extent and dynamic number of curve sample steps. If `\"shared\"`, the KDE transform will ensure that all densities are defined over a shared domain and curve steps, enabling stacking.\n\n__Default value:__ `\"shared\"`",
"enum": [
"independent",
"shared"
],
"type": "string"
},
"steps": {
"description": "The exact number of samples to take along the extent domain for plotting the density. If specified, overrides both minsteps and maxsteps to set an exact number of uniform samples. Potentially useful in conjunction with a fixed extent to ensure consistent sample points for stacked densities.",
"type": "number"
Expand Down Expand Up @@ -21942,20 +21950,14 @@
{
"$ref": "#/definitions/ColorScheme"
},
{
"items": {
"type": "string"
},
"type": "array"
},
{
"$ref": "#/definitions/SchemeParams"
},
{
"$ref": "#/definitions/ExprRef"
}
],
"description": "A string indicating a color [scheme](https://vega.github.io/vega-lite/docs/scale.html#scheme) name (e.g., `\"category10\"` or `\"blues\"`) or a [scheme parameter object](https://vega.github.io/vega-lite/docs/scale.html#scheme-params).\n\nDiscrete color schemes may be used with [discrete](https://vega.github.io/vega-lite/docs/scale.html#discrete) or [discretizing](https://vega.github.io/vega-lite/docs/scale.html#discretizing) scales. Continuous color schemes are intended for use with color scales.\n\nFor the full list of supported schemes, please refer to the [Vega Scheme](https://vega.github.io/vega/docs/schemes/#reference) reference."
"description": "A string indicating a color [scheme](https://vega.github.io/vega-lite/docs/scale.html#scheme) name (e.g., `\"category10\"` or `\"blues\"`) or a [scheme parameter object](https://vega.github.io/vega-lite/docs/scale.html#scheme-params).\n\nDiscrete color schemes may be used with [discrete](https://vega.github.io/vega-lite/docs/scale.html#discrete) or [discretizing](https://vega.github.io/vega-lite/docs/scale.html#discretizing) scales. Continuous color schemes are intended for use with color scales.\n\nTo set a custom scheme, instead set the list of values [as the scale range](https://vega.github.io/vega-lite/docs/scale.html#2-setting-the-range-property-to-an-array-of-valid-css-color-strings).\n\nFor the full list of supported schemes, please refer to the [Vega Scheme](https://vega.github.io/vega/docs/schemes/#reference) reference."
},
"type": {
"$ref": "#/definitions/ScaleType",
Expand Down
Binary file modified examples/compiled/area_density.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/area_density.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion examples/compiled/area_density.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"type": "kde",
"field": "IMDB Rating",
"bandwidth": 0.3,
"as": ["value", "density"]
"as": ["value", "density"],
"resolve": "shared"
},
{
"type": "impute",
Expand Down
14 changes: 11 additions & 3 deletions examples/compiled/bar_q_qpow.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"name": "data_0",
"source": "source_0",
"transform": [
{
"type": "stack",
"groupby": ["a"],
"field": "b",
"sort": {"field": [], "order": []},
"as": ["b_start", "b_end"],
"offset": "zero"
},
{
"type": "filter",
"expr": "isValid(datum[\"a\"]) && isFinite(+datum[\"a\"]) && isValid(datum[\"b\"]) && isFinite(+datum[\"b\"])"
Expand All @@ -40,8 +48,8 @@
},
"xc": {"scale": "x", "field": "a"},
"width": {"value": 5},
"y": {"scale": "y", "field": "b"},
"y2": {"scale": "y", "value": 0}
"y": {"scale": "y", "field": "b_end"},
"y2": {"scale": "y", "field": "b_start"}
}
}
}
Expand All @@ -59,7 +67,7 @@
{
"name": "y",
"type": "pow",
"domain": {"data": "data_0", "field": "b"},
"domain": {"data": "data_0", "fields": ["b_start", "b_end"]},
"range": [{"signal": "height"}, 0],
"nice": true,
"zero": true
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_1D_horizontal.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"value": "#4c78a8"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\")}"
},
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_1D_horizontal_custom_mark.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "red"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"value": "#4c78a8"
},
{"value": "red"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\")}"
},
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_1D_horizontal_explicit.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"value": "#4c78a8"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\")}"
},
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_1D_invalid.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_b'] >= datum['upper_box_b']",
"value": "#4c78a8"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of b\": format(datum[\"max_b\"], \"\"), \"Q3 of b\": format(datum[\"upper_box_b\"], \"\"), \"Median of b\": format(datum[\"mid_box_b\"], \"\"), \"Q1 of b\": format(datum[\"lower_box_b\"], \"\"), \"Min of b\": format(datum[\"min_b\"], \"\"), \"a\": format(datum[\"a\"], \"\")}"
},
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_1D_vertical.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"value": "#4c78a8"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\")}"
},
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_2D_horizontal.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"value": "#4c78a8"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\"), \"Species\": isValid(datum[\"Species\"]) ? datum[\"Species\"] : \"\"+datum[\"Species\"]}"
},
Expand Down
8 changes: 7 additions & 1 deletion examples/compiled/boxplot_2D_horizontal_color_size.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,13 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"value": "teal"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\"), \"Species\": isValid(datum[\"Species\"]) ? datum[\"Species\"] : \"\"+datum[\"Species\"]}"
},
Expand Down
12 changes: 10 additions & 2 deletions examples/compiled/boxplot_2D_vertical.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,14 @@
"encode": {
"update": {
"opacity": {"value": 0.7},
"fill": {"value": "white"},
"fill": [
{
"test": "datum['lower_box_Body Mass (g)'] >= datum['upper_box_Body Mass (g)']",
"scale": "color",
"field": "Species"
},
{"value": "white"}
],
"tooltip": {
"signal": "{\"Max of Body Mass (g)\": format(datum[\"max_Body Mass (g)\"], \"\"), \"Q3 of Body Mass (g)\": format(datum[\"upper_box_Body Mass (g)\"], \"\"), \"Median of Body Mass (g)\": format(datum[\"mid_box_Body Mass (g)\"], \"\"), \"Q1 of Body Mass (g)\": format(datum[\"lower_box_Body Mass (g)\"], \"\"), \"Min of Body Mass (g)\": format(datum[\"min_Body Mass (g)\"], \"\"), \"Species\": isValid(datum[\"Species\"]) ? datum[\"Species\"] : \"\"+datum[\"Species\"]}"
},
Expand Down Expand Up @@ -277,7 +284,8 @@
"domain": {
"fields": [
{"data": "data_1", "field": "Species"},
{"data": "data_6", "field": "Species"}
{"data": "data_6", "field": "Species"},
{"data": "data_7", "field": "Species"}
],
"sort": true
},
Expand Down
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 622762d

Please sign in to comment.