From aeb0c721cce0c8099e0688d7f83beae2e0fa103d Mon Sep 17 00:00:00 2001 From: Joel Ostblom Date: Tue, 27 Aug 2024 09:16:48 -0700 Subject: [PATCH 1/3] docs: Unstack area to render cumulative chart correctly (#3558) This has been broken since Vega-Lite changed the default behavior in https://github.com/vega/vega-lite/releases/tag/v5.14.1 --- .../cumulative_count_chart.py | 2 +- .../cumulative_count_chart.py | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/examples_methods_syntax/cumulative_count_chart.py diff --git a/tests/examples_arguments_syntax/cumulative_count_chart.py b/tests/examples_arguments_syntax/cumulative_count_chart.py index f6e1df075..6ee7ad277 100644 --- a/tests/examples_arguments_syntax/cumulative_count_chart.py +++ b/tests/examples_arguments_syntax/cumulative_count_chart.py @@ -17,5 +17,5 @@ sort=[{"field": "IMDB_Rating"}], ).mark_area().encode( x="IMDB_Rating:Q", - y="cumulative_count:Q" + y=alt.Y("cumulative_count:Q", stack=False) ) diff --git a/tests/examples_methods_syntax/cumulative_count_chart.py b/tests/examples_methods_syntax/cumulative_count_chart.py new file mode 100644 index 000000000..a9b08361c --- /dev/null +++ b/tests/examples_methods_syntax/cumulative_count_chart.py @@ -0,0 +1,21 @@ +""" +Cumulative Count Chart +---------------------- +This example shows an area chart with cumulative count. +Adapted from https://vega.github.io/vega-lite/examples/area_cumulative_freq.html + +""" +# category: distributions + +import altair as alt +from vega_datasets import data + +source = data.movies.url + +alt.Chart(source).transform_window( + cumulative_count="count()", + sort=[{"field": "IMDB_Rating"}], +).mark_area().encode( + x="IMDB_Rating:Q", + y=alt.Y("cumulative_count:Q").stack(False) +) From 3da2e9ed2d46fff89234ec8ac3d12ef4fa9c9971 Mon Sep 17 00:00:00 2001 From: Joel Ostblom Date: Tue, 27 Aug 2024 11:47:16 -0700 Subject: [PATCH 2/3] docs: Change remote nick to `origin` and capitalize version commit(#3559) --- RELEASING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 609f61f4d..a35a60af7 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -6,7 +6,7 @@ 2. Make certain your branch is in sync with head: - git pull upstream main + git pull origin main 3. Do a clean doc build: @@ -25,13 +25,13 @@ 5. Commit change and push to main: git add . -u - git commit -m "chore: bump version to 5.0.0" - git push upstream main + git commit -m "chore: Bump version to 5.0.0" + git push origin main 6. Tag the release: git tag -a v5.0.0 -m "version 5.0.0 release" - git push upstream v5.0.0 + git push origin v5.0.0 7. Build source & wheel distributions: @@ -54,11 +54,11 @@ 11. Commit change and push to main: git add . -u - git commit -m "chore: bump version to 5.1.0dev" - git push upstream main + git commit -m "chore: Bump version to 5.1.0dev" + git push origin main 12. Double-check that a conda-forge pull request is generated from the updated - pip package by the conda-forge bot (may take up to ~an hour): + pip package by the conda-forge bot (may take up to several hours): https://github.com/conda-forge/altair-feedstock/pulls 13. Publish a new release in https://github.com/vega/altair/releases/ From b73467d4c5713ec05aeb4feb13712102ceb38fc4 Mon Sep 17 00:00:00 2001 From: dangotbanned <125183946+dangotbanned@users.noreply.github.com> Date: Tue, 27 Aug 2024 21:47:44 +0100 Subject: [PATCH 3/3] ci: Add `typings/` to `.gitignore` --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index d72e70d4c..6262da0b7 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,6 @@ Untitled*.ipynb # hatch, doc generation data.json + +# type stubs +typings/ \ No newline at end of file