diff --git a/tests/examples_arguments_syntax/ranged_dot_plot.py b/tests/examples_arguments_syntax/ranged_dot_plot.py index d7efcf77c..2ca244eb4 100644 --- a/tests/examples_arguments_syntax/ranged_dot_plot.py +++ b/tests/examples_arguments_syntax/ranged_dot_plot.py @@ -9,35 +9,32 @@ source = data.countries.url -chart = alt.Chart( - data=source -).transform_filter( - filter={"field": 'country', - "oneOf": ["China", "India", "United States", "Indonesia", "Brazil"]} -).transform_filter( - filter={'field': 'year', - "oneOf": [1955, 2000]} +chart = ( + alt.Chart(source) + .encode(x="life_expect:Q", y="country:N") + .transform_filter( + alt.FieldOneOfPredicate( + field="country", + oneOf=["China", "India", "United States", "Indonesia", "Brazil"], + ) + ) + .transform_filter(alt.FieldOneOfPredicate(field="year", oneOf=[1955, 2000])) ) -line = chart.mark_line(color='#db646f').encode( - x='life_expect:Q', - y='country:N', - detail='country:N' -) +line = chart.mark_line(color="#db646f").encode(detail="country:N") + # Add points for life expectancy in 1955 & 2000 -points = chart.mark_point( - size=100, - opacity=1, - filled=True -).encode( - x='life_expect:Q', - y='country:N', - color=alt.Color('year:O', - scale=alt.Scale( - domain=[1955, 2000], - range=['#e6959c', '#911a24'] - ) +color = alt.Color( + "year:O", scale=alt.Scale(domain=[1955, 2000], range=["#e6959c", "#911a24"]) +) +points = ( + chart.mark_point( + size=100, + opacity=1, + filled=True, ) -).interactive() + .encode(color=color) + .interactive() +) (line + points) diff --git a/tests/examples_methods_syntax/ranged_dot_plot.py b/tests/examples_methods_syntax/ranged_dot_plot.py index 340eeed32..d2649c7ec 100644 --- a/tests/examples_methods_syntax/ranged_dot_plot.py +++ b/tests/examples_methods_syntax/ranged_dot_plot.py @@ -9,30 +9,30 @@ source = data.countries.url -chart = alt.Chart( - data=source -).transform_filter( - filter={"field": 'country', - "oneOf": ["China", "India", "United States", "Indonesia", "Brazil"]} -).transform_filter( - filter={'field': 'year', - "oneOf": [1955, 2000]} +chart = ( + alt.Chart(source) + .encode(x="life_expect:Q", y="country:N") + .transform_filter( + alt.FieldOneOfPredicate( + field="country", + oneOf=["China", "India", "United States", "Indonesia", "Brazil"], + ) + ) + .transform_filter(alt.FieldOneOfPredicate(field="year", oneOf=[1955, 2000])) ) -line = chart.mark_line(color='#db646f').encode( - x='life_expect:Q', - y='country:N', - detail='country:N' -) +line = chart.mark_line(color="#db646f").encode(detail="country:N") + # Add points for life expectancy in 1955 & 2000 -points = chart.mark_point( - size=100, - opacity=1, - filled=True -).encode( - x='life_expect:Q', - y='country:N', - color=alt.Color('year:O').scale(domain=[1955, 2000], range=['#e6959c', '#911a24']) -).interactive() +color = alt.Color("year:O").scale(domain=[1955, 2000], range=["#e6959c", "#911a24"]) +points = ( + chart.mark_point( + size=100, + opacity=1, + filled=True, + ) + .encode(color=color) + .interactive() +) (line + points)