feat: Upgrade Vega-Lite from 5.17.0 to 5.19.0 (vega#3479)

* feat: Upgrade Vega-Lite from 5.17.0 to 5.19.0 * Add support for new resolve argument for density transform * Update editor url in test. Adapt to fixed typo in utcweeksdayhours * Bump VL version used for JupyterChart * Bump minimum vl-convert version to 1.5
dangotbanned · Jul 17, 2024 · f8c9776 · f8c9776
1 parent 9afd374
commit f8c9776
Show file tree

Hide file tree

Showing 16 changed files with 1,800 additions and 392 deletions.
diff --git a/altair/__init__.py b/altair/__init__.py
@@ -283,6 +283,7 @@
     "Mark",
     "MarkConfig",
     "MarkDef",
+    "MarkInvalidDataMode",
     "MarkPropDefGradientstringnull",
     "MarkPropDefnumber",
     "MarkPropDefnumberArray",
@@ -382,6 +383,41 @@
     "ScaleFieldDef",
     "ScaleInterpolateEnum",
     "ScaleInterpolateParams",
+    "ScaleInvalidDataConfig",
+    "ScaleInvalidDataShowAsValueangle",
+    "ScaleInvalidDataShowAsValuecolor",
+    "ScaleInvalidDataShowAsValuefill",
+    "ScaleInvalidDataShowAsValuefillOpacity",
+    "ScaleInvalidDataShowAsValueopacity",
+    "ScaleInvalidDataShowAsValueradius",
+    "ScaleInvalidDataShowAsValueshape",
+    "ScaleInvalidDataShowAsValuesize",
+    "ScaleInvalidDataShowAsValuestroke",
+    "ScaleInvalidDataShowAsValuestrokeDash",
+    "ScaleInvalidDataShowAsValuestrokeOpacity",
+    "ScaleInvalidDataShowAsValuestrokeWidth",
+    "ScaleInvalidDataShowAsValuetheta",
+    "ScaleInvalidDataShowAsValuex",
+    "ScaleInvalidDataShowAsValuexOffset",
+    "ScaleInvalidDataShowAsValuey",
+    "ScaleInvalidDataShowAsValueyOffset",
+    "ScaleInvalidDataShowAsangle",
+    "ScaleInvalidDataShowAscolor",
+    "ScaleInvalidDataShowAsfill",
+    "ScaleInvalidDataShowAsfillOpacity",
+    "ScaleInvalidDataShowAsopacity",
+    "ScaleInvalidDataShowAsradius",
+    "ScaleInvalidDataShowAsshape",
+    "ScaleInvalidDataShowAssize",
+    "ScaleInvalidDataShowAsstroke",
+    "ScaleInvalidDataShowAsstrokeDash",
+    "ScaleInvalidDataShowAsstrokeOpacity",
+    "ScaleInvalidDataShowAsstrokeWidth",
+    "ScaleInvalidDataShowAstheta",
+    "ScaleInvalidDataShowAsx",
+    "ScaleInvalidDataShowAsxOffset",
+    "ScaleInvalidDataShowAsy",
+    "ScaleInvalidDataShowAsyOffset",
     "ScaleResolveMap",
     "ScaleType",
     "SchemaBase",

diff --git a/altair/jupyter/js/index.js b/altair/jupyter/js/index.js
@@ -1,4 +1,4 @@
-import vegaEmbed from "https://esm.sh/vega-embed@6?deps=vega@5&deps=vega-lite@5.17.0";
+import vegaEmbed from "https://esm.sh/vega-embed@6?deps=vega@5&deps=vega-lite@5.19.0";
 import lodashDebounce from "https://esm.sh/[email protected]/debounce";
 
 // Note: For offline support, the import lines above are removed and the remaining script

diff --git a/altair/utils/_importers.py b/altair/utils/_importers.py
@@ -41,7 +41,7 @@ def import_vegafusion() -> ModuleType:
 
 
 def import_vl_convert() -> ModuleType:
-    min_version = "1.3.0"
+    min_version = "1.5.0"
     try:
         version = importlib_version("vl-convert-python")
         if Version(version) < Version(min_version):

diff --git a/altair/utils/core.py b/altair/utils/core.py
@@ -187,7 +187,7 @@ def __dataframe__(
     "utcmonthdatehoursminutes",
     "utcmonthdatehoursminutesseconds",
     "utcweekday",
-    "utcweeksdayhours",
+    "utcweekdayhours",
     "utcweekdayhoursminutes",
     "utcweekdayhoursminutesseconds",
     "utcdayhours",

diff --git a/altair/vegalite/v5/api.py b/altair/vegalite/v5/api.py
@@ -93,6 +93,7 @@
         SelectionResolution_T,
         SingleDefUnitChannel_T,
         StackOffset_T,
+        ResolveMode_T,
     )
 
 ChartDataType: TypeAlias = Optional[Union[DataType, core.Data, str, core.Generator]]
@@ -1764,6 +1765,7 @@ def transform_density(
         maxsteps: Optional[int] = Undefined,
         minsteps: Optional[int] = Undefined,
         steps: Optional[int] = Undefined,
+        resolve: Optional[ResolveMode_T] = Undefined,
     ) -> Self:
         """Add a :class:`DensityTransform` to the spec.
 
@@ -1804,6 +1806,13 @@ def transform_density(
             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.
+        resolve : Literal['independent', 'shared']
+            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.
+
+            **Default value:** ``"shared"``
         """
         return self._add_transform(
             core.DensityTransform(
@@ -1816,6 +1825,7 @@ def transform_density(
                 maxsteps=maxsteps,
                 minsteps=minsteps,
                 steps=steps,
+                resolve=resolve,
                 **{"as": as_},
             )
         )

diff --git a/altair/vegalite/v5/schema/__init__.py b/altair/vegalite/v5/schema/__init__.py
@@ -3,6 +3,6 @@
 from .core import *
 from .channels import *
 
-SCHEMA_VERSION = "v5.17.0"
+SCHEMA_VERSION = "v5.19.0"
 
-SCHEMA_URL = "https://vega.github.io/schema/vega-lite/v5.17.0.json"
+SCHEMA_URL = "https://vega.github.io/schema/vega-lite/v5.19.0.json"
diff --git a/altair/vegalite/v5/schema/_typing.py b/altair/vegalite/v5/schema/_typing.py
@@ -27,6 +27,7 @@
     "LayoutAlign_T",
     "LegendOrient_T",
     "Map",
+    "MarkInvalidDataMode_T",
     "MarkType_T",
     "Mark_T",
     "MultiTimeUnit_T",
@@ -723,6 +724,13 @@
     "bottom-left",
     "bottom-right",
 ]
+MarkInvalidDataMode_T: TypeAlias = Literal[
+    "filter",
+    "break-paths-filter-domains",
+    "break-paths-show-domains",
+    "break-paths-show-path-domains",
+    "show",
+]
 MarkType_T: TypeAlias = Literal[
     "arc",
     "area",
@@ -802,7 +810,7 @@
     "utcmonthdatehoursminutes",
     "utcmonthdatehoursminutesseconds",
     "utcweekday",
-    "utcweeksdayhours",
+    "utcweekdayhours",
     "utcweekdayhoursminutes",
     "utcweekdayhoursminutesseconds",
     "utcdayhours",

diff --git a/altair/vegalite/v5/schema/channels.py b/altair/vegalite/v5/schema/channels.py
diff --git a/altair/vegalite/v5/schema/core.py b/altair/vegalite/v5/schema/core.py
diff --git a/altair/vegalite/v5/schema/mixins.py b/altair/vegalite/v5/schema/mixins.py
@@ -4,7 +4,7 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING, Literal, Sequence
+from typing import TYPE_CHECKING, Sequence
 
 from altair.utils import use_signature
 from altair.utils.schemapi import Undefined
@@ -84,7 +84,7 @@ def mark_arc(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -291,7 +291,7 @@ def mark_area(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -498,7 +498,7 @@ def mark_bar(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -705,7 +705,7 @@ def mark_image(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -912,7 +912,7 @@ def mark_line(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -1119,7 +1119,7 @@ def mark_point(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -1326,7 +1326,7 @@ def mark_rect(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -1533,7 +1533,7 @@ def mark_rule(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -1740,7 +1740,7 @@ def mark_text(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -1947,7 +1947,7 @@ def mark_tick(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -2154,7 +2154,7 @@ def mark_trail(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -2361,7 +2361,7 @@ def mark_circle(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -2568,7 +2568,7 @@ def mark_square(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -2775,7 +2775,7 @@ def mark_geoshape(
         interpolate: Optional[
             dict | Parameter | SchemaBase | Interpolate_T
         ] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         limit: Optional[dict | float | Parameter | SchemaBase] = Undefined,
         line: Optional[bool | dict | SchemaBase] = Undefined,
         lineBreak: Optional[str | dict | Parameter | SchemaBase] = Undefined,
@@ -2935,7 +2935,7 @@ def mark_boxplot(
         clip: Optional[bool] = Undefined,
         color: Optional[str | dict | Parameter | SchemaBase | ColorName_T] = Undefined,
         extent: Optional[str | float] = Undefined,
-        invalid: Optional[Literal["filter", None]] = Undefined,
+        invalid: Optional[None | SchemaBase | MarkInvalidDataMode_T] = Undefined,
         median: Optional[bool | dict | SchemaBase] = Undefined,
         opacity: Optional[float] = Undefined,
         orient: Optional[SchemaBase | Orientation_T] = Undefined,