Merge branch 'main' into vega-datasets

altair/utils/_importers.py

@@ -12,6 +12,8 @@
 def import_vegafusion() -> ModuleType:
     min_version = "1.5.0"
     try:
+        import vegafusion as vf
+
         version = importlib_version("vegafusion")
         embed_version = importlib_version("vegafusion-python-embed")
         if version != embed_version or Version(version) < Version(min_version):
@@ -23,7 +25,6 @@ def import_vegafusion() -> ModuleType:
                 f" - vegafusion-python-embed=={embed_version}\n"
             )
             raise RuntimeError(msg)
-        import vegafusion as vf  # type: ignore
 
         return vf
     except ImportError as err:

altair/utils/_vegafusion_data.py

@@ -26,7 +26,7 @@
 if TYPE_CHECKING:
     from narwhals.typing import IntoDataFrame
 
-    from vegafusion.runtime import ChartState  # type: ignore
+    from vegafusion.runtime import ChartState
 
 # Temporary storage for dataframes that have been extracted
 # from charts by the vegafusion data transformer. Use a WeakValueDictionary

pyproject.toml

@@ -60,7 +60,7 @@ all = [
     "pandas>=0.25.3",
     "numpy",
     "pyarrow>=11",
-    "vegafusion[embed]>=1.6.6",
+    "vegafusion[embed]>=1.6.6,<2",
     "anywidget>=0.9.0",
     "altair_tiles>=0.3.0"
 ]
@@ -436,9 +436,7 @@ module = [
     "nbformat.*",
     "ipykernel.*",
     "ibis.*",
-    # This refers to schemapi in the tools folder which is imported
-    # by the tools scripts such as generate_schema_wrapper.py
-    # "schemapi.*"
+    "vegafusion.*",
 ]
 ignore_missing_imports = true
 

tests/test_jupyter_chart.py

@@ -26,7 +26,7 @@
 
 
 try:
-    import vegafusion  # type: ignore # noqa: F401
+    import vegafusion  # noqa: F401
 
     transformers = ["default", "vegafusion"]
 except ImportError:

tests/test_transformed_data.py

@@ -10,7 +10,7 @@
 import narwhals as nw
 
 try:
-    import vegafusion as vf  # type: ignore
+    import vegafusion as vf
 except ImportError:
     vf = None