move tests and sphinxext outside folder application code (#2792)

* move tests to test folder * define path sphinxext extensions * rename examples folder and init function * exclude examples_arguments_syntax dir for black * fix linting * exclude example files for flake and black * apply pytest to tests folder * update makefile to test tests folder * add missing pytest-cov to requirements_dev file * add missing .py extension to example file
vega · Jan 2, 2023 · 0d82108 · 0d82108
1 parent 6638ca5
commit 0d82108
Show file tree

Hide file tree

Showing 230 changed files with 103 additions and 96 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,38 +7,38 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     name: Python ${{ matrix.python-version }}
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Set Up Chromedriver
-      run: |
-        sudo apt-get update
-        sudo apt-get --only-upgrade install google-chrome-stable
-        sudo apt-get -yqq install chromium-chromedriver
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install .[dev]
-        pip install "selenium<4.3.0"
-        pip install altair_saver vl-convert-python
-        pip install git+https://github.com/altair-viz/altair_viewer.git
-    - name: Test with pytest
-      run: |
-        pytest --doctest-modules altair
-    - name: Selected tests without vl-convert-python
-      run: |
-        pip uninstall vl-convert-python --yes
-        pytest -m save_engine --doctest-modules altair
-    - name: Selected tests without vl-convert-python and altair_saver
-      run: |
-        pip uninstall altair_saver --yes
-        pytest -m save_engine --doctest-modules altair
-    - name: Selected tests with vl-convert-python and without altair_saver
-      run: |
-        pip install vl-convert-python
-        pytest -m save_engine --doctest-modules altair
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Set Up Chromedriver
+        run: |
+          sudo apt-get update
+          sudo apt-get --only-upgrade install google-chrome-stable
+          sudo apt-get -yqq install chromium-chromedriver
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install .[dev]
+          pip install "selenium<4.3.0"
+          pip install altair_saver vl-convert-python
+          pip install git+https://github.com/altair-viz/altair_viewer.git
+      - name: Test with pytest
+        run: |
+          pytest --doctest-modules tests
+      - name: Selected tests without vl-convert-python
+        run: |
+          pip uninstall vl-convert-python --yes
+          pytest -m save_engine --doctest-modules tests
+      - name: Selected tests without vl-convert-python and altair_saver
+        run: |
+          pip uninstall altair_saver --yes
+          pytest -m save_engine --doctest-modules tests
+      - name: Selected tests with vl-convert-python and without altair_saver
+        run: |
+          pip install vl-convert-python
+          pytest -m save_engine --doctest-modules tests
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ install:
 test :
 	black . --check
 	flake8 . --statistics
-	python -m pytest --pyargs --doctest-modules altair
+	python -m pytest --pyargs --doctest-modules tests
 
 test-coverage:
 	python -m pytest --pyargs --doctest-modules --cov=altair --cov-report term altair

diff --git a/altair/__init__.py b/altair/__init__.py
@@ -2,7 +2,6 @@
 __version__ = "4.3.0.dev0"
 
 from .vegalite import *
-from . import examples
 
 
 def load_ipython_extension(ipython):

diff --git a/altair/examples/__init__.py b/altair/examples/__init__.py
diff --git a/altair/utils/core.py b/altair/utils/core.py
@@ -14,7 +14,7 @@
 import pandas as pd
 import numpy as np
 
-from .schemapi import SchemaBase, Undefined
+from altair.utils.schemapi import SchemaBase, Undefined
 
 try:
     from pandas.api.types import infer_dtype as _infer_dtype

diff --git a/doc/conf.py b/doc/conf.py
@@ -36,9 +36,9 @@
     "sphinx.ext.coverage",
     "sphinx.ext.githubpages",
     "numpydoc.numpydoc",
-    "altair.sphinxext.altairplot",
-    "altair.sphinxext.altairgallery",
-    "altair.sphinxext.schematable",
+    "sphinxext.altairplot",
+    "sphinxext.altairgallery",
+    "sphinxext.schematable",
     # "sphinxext.rediraffe",
 ]
 
@@ -84,7 +84,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'en'
+language = "en"
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -154,12 +154,10 @@
             "type": "fontawesome",
         },
     ],
-    "header_links_before_dropdown": 6
+    "header_links_before_dropdown": 6,
 }
 
-html_context = {
-    "default_mode": "light"
-}
+html_context = {"default_mode": "light"}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,7 +10,7 @@ exclude = '''
   | build
   | dist
   | doc
-  | altair/examples
+  | tests/examples_arguments_syntax
   | altair/vega/v\d*/schema
   | altair/vegalite/v\d*/schema
 )/

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -3,6 +3,7 @@ docutils
 ipython
 flake8
 pytest
+pytest-cov
 sphinx
 mistune<2.0.0  # necessary for m2r v0.2
 m2r

diff --git a/setup.cfg b/setup.cfg
@@ -7,7 +7,7 @@ exclude =
   .git,
   build,
   __pycache__,
-  altair/examples
+  tests/examples_arguments_syntax
   altair/vega*/v?/schema
 
 [metadata]

diff --git a/altair/examples/tests/__init__.py → sphinxext/__init__.py b/altair/examples/tests/__init__.py → sphinxext/__init__.py
diff --git a/altair/sphinxext/altairgallery.py → sphinxext/altairgallery.py b/altair/sphinxext/altairgallery.py → sphinxext/altairgallery.py
@@ -22,7 +22,7 @@
     create_generic_image,
 )
 from altair.utils.execeval import eval_block
-from altair.examples import iter_examples
+from tests.examples_arguments_syntax import iter_examples_arguments_syntax
 
 
 EXAMPLE_MODULE = "altair.examples"
@@ -165,7 +165,7 @@ def save_example_pngs(examples, image_dir, make_thumbnails=True):
 def populate_examples(**kwds):
     """Iterate through Altair examples and extract code"""
 
-    examples = sorted(iter_examples(), key=itemgetter("name"))
+    examples = sorted(iter_examples_arguments_syntax(), key=itemgetter("name"))
 
     for example in examples:
         docstring, category, code, lineno = get_docstring_and_rest(example["filename"])

diff --git a/altair/sphinxext/altairplot.py → sphinxext/altairplot.py b/altair/sphinxext/altairplot.py → sphinxext/altairplot.py
diff --git a/altair/sphinxext/schematable.py → sphinxext/schematable.py b/altair/sphinxext/schematable.py → sphinxext/schematable.py
diff --git a/altair/sphinxext/utils.py → sphinxext/utils.py b/altair/sphinxext/utils.py → sphinxext/utils.py
diff --git a/altair/expr/tests/__init__.py → tests/__init__.py b/altair/expr/tests/__init__.py → tests/__init__.py
diff --git a/tests/examples_arguments_syntax/__init__.py b/tests/examples_arguments_syntax/__init__.py
@@ -0,0 +1,19 @@
+import os
+
+
+def iter_examples_arguments_syntax():
+    """Iterate over the examples in this directory.
+
+    Each item is a dict with the following keys:
+    - "name" : the unique name of the example
+    - "filename" : the full file path to the example
+    """
+    examples_arguments_syntax_dir = os.path.abspath(os.path.dirname(__file__))
+    for filename in os.listdir(examples_arguments_syntax_dir):
+        name, ext = os.path.splitext(filename)
+        if name.startswith("_") or ext != ".py":
+            continue
+        yield {
+            "name": name,
+            "filename": os.path.join(examples_arguments_syntax_dir, filename),
+        }
diff --git a/altair/examples/airport_connections.py → ...s_arguments_syntax/airport_connections.py b/altair/examples/airport_connections.py → ...s_arguments_syntax/airport_connections.py
diff --git a/altair/examples/annual_weather_heatmap.py → ...rguments_syntax/annual_weather_heatmap.py b/altair/examples/annual_weather_heatmap.py → ...rguments_syntax/annual_weather_heatmap.py
diff --git a/altair/examples/anscombe_plot.py → ...xamples_arguments_syntax/anscombe_plot.py b/altair/examples/anscombe_plot.py → ...xamples_arguments_syntax/anscombe_plot.py
diff --git a/altair/examples/area_chart_gradient.py → ...s_arguments_syntax/area_chart_gradient.py b/altair/examples/area_chart_gradient.py → ...s_arguments_syntax/area_chart_gradient.py
diff --git a/...r/examples/bar_and_line_with_dual_axis.py → ...nts_syntax/bar_and_line_with_dual_axis.py b/...r/examples/bar_and_line_with_dual_axis.py → ...nts_syntax/bar_and_line_with_dual_axis.py
diff --git a/altair/examples/bar_chart_horizontal.py → ..._arguments_syntax/bar_chart_horizontal.py b/altair/examples/bar_chart_horizontal.py → ..._arguments_syntax/bar_chart_horizontal.py
diff --git a/altair/examples/bar_chart_sorted.py → ...ples_arguments_syntax/bar_chart_sorted.py b/altair/examples/bar_chart_sorted.py → ...ples_arguments_syntax/bar_chart_sorted.py
diff --git a/altair/examples/bar_chart_trellis_compact.py → ...ments_syntax/bar_chart_trellis_compact.py b/altair/examples/bar_chart_trellis_compact.py → ...ments_syntax/bar_chart_trellis_compact.py
diff --git a/...xamples/bar_chart_with_highlighted_bar.py → ..._syntax/bar_chart_with_highlighted_bar.py b/...xamples/bar_chart_with_highlighted_bar.py → ..._syntax/bar_chart_with_highlighted_bar.py
diff --git a/...les/bar_chart_with_highlighted_segment.py → ...tax/bar_chart_with_highlighted_segment.py b/...les/bar_chart_with_highlighted_segment.py → ...tax/bar_chart_with_highlighted_segment.py
diff --git a/altair/examples/bar_chart_with_labels.py → ...arguments_syntax/bar_chart_with_labels.py b/altair/examples/bar_chart_with_labels.py → ...arguments_syntax/bar_chart_with_labels.py
diff --git a/altair/examples/bar_chart_with_mean_line.py → ...uments_syntax/bar_chart_with_mean_line.py b/altair/examples/bar_chart_with_mean_line.py → ...uments_syntax/bar_chart_with_mean_line.py
diff --git a/altair/examples/bar_chart_with_negatives.py → ...uments_syntax/bar_chart_with_negatives.py b/altair/examples/bar_chart_with_negatives.py → ...uments_syntax/bar_chart_with_negatives.py
diff --git a/altair/examples/bar_rounded.py → .../examples_arguments_syntax/bar_rounded.py b/altair/examples/bar_rounded.py → .../examples_arguments_syntax/bar_rounded.py
diff --git a/altair/examples/bar_with_rolling_mean.py → ...arguments_syntax/bar_with_rolling_mean.py b/altair/examples/bar_with_rolling_mean.py → ...arguments_syntax/bar_with_rolling_mean.py
diff --git a/...r/examples/beckers_barley_trellis_plot.py → ...nts_syntax/beckers_barley_trellis_plot.py b/...r/examples/beckers_barley_trellis_plot.py → ...nts_syntax/beckers_barley_trellis_plot.py
diff --git a/.../examples/beckers_barley_wrapped_facet.py → ...ts_syntax/beckers_barley_wrapped_facet.py b/.../examples/beckers_barley_wrapped_facet.py → ...ts_syntax/beckers_barley_wrapped_facet.py
diff --git a/altair/examples/boxplot.py → tests/examples_arguments_syntax/boxplot.py b/altair/examples/boxplot.py → tests/examples_arguments_syntax/boxplot.py
diff --git a/altair/examples/bubble_plot.py → .../examples_arguments_syntax/bubble_plot.py b/altair/examples/bubble_plot.py → .../examples_arguments_syntax/bubble_plot.py
diff --git a/altair/examples/bump_chart.py → ...s/examples_arguments_syntax/bump_chart.py b/altair/examples/bump_chart.py → ...s/examples_arguments_syntax/bump_chart.py
diff --git a/altair/examples/candlestick_chart.py → ...les_arguments_syntax/candlestick_chart.py b/altair/examples/candlestick_chart.py → ...les_arguments_syntax/candlestick_chart.py
diff --git a/altair/examples/choropleth.py → ...s/examples_arguments_syntax/choropleth.py b/altair/examples/choropleth.py → ...s/examples_arguments_syntax/choropleth.py
diff --git a/altair/examples/choropleth_repeat.py → ...les_arguments_syntax/choropleth_repeat.py b/altair/examples/choropleth_repeat.py → ...les_arguments_syntax/choropleth_repeat.py
diff --git a/altair/examples/co2_concentration.py → ...les_arguments_syntax/co2_concentration.py b/altair/examples/co2_concentration.py → ...les_arguments_syntax/co2_concentration.py
diff --git a/altair/examples/comet_chart.py → .../examples_arguments_syntax/comet_chart.py b/altair/examples/comet_chart.py → .../examples_arguments_syntax/comet_chart.py
diff --git a/altair/examples/connected_scatterplot.py → ...arguments_syntax/connected_scatterplot.py b/altair/examples/connected_scatterplot.py → ...arguments_syntax/connected_scatterplot.py
diff --git a/altair/examples/cumulative_count_chart.py → ...rguments_syntax/cumulative_count_chart.py b/altair/examples/cumulative_count_chart.py → ...rguments_syntax/cumulative_count_chart.py
diff --git a/altair/examples/dendrogram.py → ...s/examples_arguments_syntax/dendrogram.py b/altair/examples/dendrogram.py → ...s/examples_arguments_syntax/dendrogram.py
diff --git a/altair/examples/density_facet.py → ...xamples_arguments_syntax/density_facet.py b/altair/examples/density_facet.py → ...xamples_arguments_syntax/density_facet.py
diff --git a/altair/examples/density_stack.py → ...xamples_arguments_syntax/density_stack.py b/altair/examples/density_stack.py → ...xamples_arguments_syntax/density_stack.py
diff --git a/...r/examples/diverging_stacked_bar_chart.py → ...nts_syntax/diverging_stacked_bar_chart.py b/...r/examples/diverging_stacked_bar_chart.py → ...nts_syntax/diverging_stacked_bar_chart.py
diff --git a/altair/examples/donut_chart.py → .../examples_arguments_syntax/donut_chart.py b/altair/examples/donut_chart.py → .../examples_arguments_syntax/donut_chart.py
diff --git a/altair/examples/dot_dash_plot.py → ...xamples_arguments_syntax/dot_dash_plot.py b/altair/examples/dot_dash_plot.py → ...xamples_arguments_syntax/dot_dash_plot.py
diff --git a/...rical_cumulative_distribution_function.py → ...rical_cumulative_distribution_function.py b/...rical_cumulative_distribution_function.py → ...rical_cumulative_distribution_function.py
diff --git a/altair/examples/errorbars_with_ci.py → ...les_arguments_syntax/errorbars_with_ci.py b/altair/examples/errorbars_with_ci.py → ...les_arguments_syntax/errorbars_with_ci.py
diff --git a/altair/examples/errorbars_with_std.py → ...es_arguments_syntax/errorbars_with_std.py b/altair/examples/errorbars_with_std.py → ...es_arguments_syntax/errorbars_with_std.py
diff --git a/altair/examples/falkensee.py → tests/examples_arguments_syntax/falkensee.py b/altair/examples/falkensee.py → tests/examples_arguments_syntax/falkensee.py
diff --git a/altair/examples/filled_step_chart.py → ...les_arguments_syntax/filled_step_chart.py b/altair/examples/filled_step_chart.py → ...les_arguments_syntax/filled_step_chart.py
diff --git a/altair/examples/gantt_chart.py → .../examples_arguments_syntax/gantt_chart.py b/altair/examples/gantt_chart.py → .../examples_arguments_syntax/gantt_chart.py
diff --git a/altair/examples/gapminder_bubble_plot.py → ...arguments_syntax/gapminder_bubble_plot.py b/altair/examples/gapminder_bubble_plot.py → ...arguments_syntax/gapminder_bubble_plot.py
diff --git a/altair/examples/groupby-map.py → .../examples_arguments_syntax/groupby-map.py b/altair/examples/groupby-map.py → .../examples_arguments_syntax/groupby-map.py
diff --git a/altair/examples/grouped_bar_chart.py → ...les_arguments_syntax/grouped_bar_chart.py b/altair/examples/grouped_bar_chart.py → ...les_arguments_syntax/grouped_bar_chart.py
diff --git a/altair/examples/grouped_bar_chart2.py → ...es_arguments_syntax/grouped_bar_chart2.py b/altair/examples/grouped_bar_chart2.py → ...es_arguments_syntax/grouped_bar_chart2.py
diff --git a/.../examples/grouped_bar_chart_horizontal.py → ...ts_syntax/grouped_bar_chart_horizontal.py b/.../examples/grouped_bar_chart_horizontal.py → ...ts_syntax/grouped_bar_chart_horizontal.py
diff --git a/...ples/grouped_bar_chart_with_error_bars.py → ...ntax/grouped_bar_chart_with_error_bars.py b/...ples/grouped_bar_chart_with_error_bars.py → ...ntax/grouped_bar_chart_with_error_bars.py
diff --git a/altair/examples/hexbins.py → tests/examples_arguments_syntax/hexbins.py b/altair/examples/hexbins.py → tests/examples_arguments_syntax/hexbins.py
diff --git a/altair/examples/histogram_heatmap.py → ...les_arguments_syntax/histogram_heatmap.py b/altair/examples/histogram_heatmap.py → ...les_arguments_syntax/histogram_heatmap.py
diff --git a/altair/examples/histogram_responsive.py → ..._arguments_syntax/histogram_responsive.py b/altair/examples/histogram_responsive.py → ..._arguments_syntax/histogram_responsive.py
diff --git a/altair/examples/histogram_scatterplot.py → ...arguments_syntax/histogram_scatterplot.py b/altair/examples/histogram_scatterplot.py → ...arguments_syntax/histogram_scatterplot.py
diff --git a/...s/histogram_with_a_global_mean_overlay.py → ...x/histogram_with_a_global_mean_overlay.py b/...s/histogram_with_a_global_mean_overlay.py → ...x/histogram_with_a_global_mean_overlay.py
diff --git a/altair/examples/horizon_graph.py → ...xamples_arguments_syntax/horizon_graph.py b/altair/examples/horizon_graph.py → ...xamples_arguments_syntax/horizon_graph.py
diff --git a/.../examples/horizontal_stacked_bar_chart.py → ...ts_syntax/horizontal_stacked_bar_chart.py b/.../examples/horizontal_stacked_bar_chart.py → ...ts_syntax/horizontal_stacked_bar_chart.py
diff --git a/altair/examples/image_tooltip.py → ...xamples_arguments_syntax/image_tooltip.py b/altair/examples/image_tooltip.py → ...xamples_arguments_syntax/image_tooltip.py
diff --git a/altair/examples/interactive_brush.py → ...les_arguments_syntax/interactive_brush.py b/altair/examples/interactive_brush.py → ...les_arguments_syntax/interactive_brush.py
diff --git a/...r/examples/interactive_cross_highlight.py → ...nts_syntax/interactive_cross_highlight.py b/...r/examples/interactive_cross_highlight.py → ...nts_syntax/interactive_cross_highlight.py
diff --git a/...amples/interactive_layered_crossfilter.py → ...syntax/interactive_layered_crossfilter.py b/...amples/interactive_layered_crossfilter.py → ...syntax/interactive_layered_crossfilter.py
diff --git a/altair/examples/interactive_legend.py → ...es_arguments_syntax/interactive_legend.py b/altair/examples/interactive_legend.py → ...es_arguments_syntax/interactive_legend.py
diff --git a/altair/examples/interactive_scatter_plot.py → ...uments_syntax/interactive_scatter_plot.py b/altair/examples/interactive_scatter_plot.py → ...uments_syntax/interactive_scatter_plot.py
diff --git a/altair/examples/interval_selection.py → ...es_arguments_syntax/interval_selection.py b/altair/examples/interval_selection.py → ...es_arguments_syntax/interval_selection.py
diff --git a/altair/examples/iowa_electricity.py → ...ples_arguments_syntax/iowa_electricity.py b/altair/examples/iowa_electricity.py → ...ples_arguments_syntax/iowa_electricity.py
diff --git a/altair/examples/isotype.py → tests/examples_arguments_syntax/isotype.py b/altair/examples/isotype.py → tests/examples_arguments_syntax/isotype.py
diff --git a/altair/examples/isotype_emoji.py → ...xamples_arguments_syntax/isotype_emoji.py b/altair/examples/isotype_emoji.py → ...xamples_arguments_syntax/isotype_emoji.py
diff --git a/altair/examples/isotype_grid.py → ...examples_arguments_syntax/isotype_grid.py b/altair/examples/isotype_grid.py → ...examples_arguments_syntax/isotype_grid.py
diff --git a/altair/examples/lasagna_plot.py → ...examples_arguments_syntax/lasagna_plot.py b/altair/examples/lasagna_plot.py → ...examples_arguments_syntax/lasagna_plot.py
diff --git a/altair/examples/layer_line_color_rule.py → ...arguments_syntax/layer_line_color_rule.py b/altair/examples/layer_line_color_rule.py → ...arguments_syntax/layer_line_color_rule.py
diff --git a/altair/examples/layered_area_chart.py → ...es_arguments_syntax/layered_area_chart.py b/altair/examples/layered_area_chart.py → ...es_arguments_syntax/layered_area_chart.py
diff --git a/altair/examples/layered_bar_chart.py → ...les_arguments_syntax/layered_bar_chart.py b/altair/examples/layered_bar_chart.py → ...les_arguments_syntax/layered_bar_chart.py
diff --git a/altair/examples/layered_chart_bar_mark.py → ...rguments_syntax/layered_chart_bar_mark.py b/altair/examples/layered_chart_bar_mark.py → ...rguments_syntax/layered_chart_bar_mark.py
diff --git a/.../examples/layered_chart_with_dual_axis.py → ...ts_syntax/layered_chart_with_dual_axis.py b/.../examples/layered_chart_with_dual_axis.py → ...ts_syntax/layered_chart_with_dual_axis.py
diff --git a/altair/examples/layered_heatmap_text.py → ..._arguments_syntax/layered_heatmap_text.py b/altair/examples/layered_heatmap_text.py → ..._arguments_syntax/layered_heatmap_text.py
diff --git a/altair/examples/layered_histogram.py → ...les_arguments_syntax/layered_histogram.py b/altair/examples/layered_histogram.py → ...les_arguments_syntax/layered_histogram.py
diff --git a/...r/examples/line_chart_with_color_datum.py → ...nts_syntax/line_chart_with_color_datum.py b/...r/examples/line_chart_with_color_datum.py → ...nts_syntax/line_chart_with_color_datum.py
diff --git a/altair/examples/line_chart_with_cumsum.py → ...rguments_syntax/line_chart_with_cumsum.py b/altair/examples/line_chart_with_cumsum.py → ...rguments_syntax/line_chart_with_cumsum.py
diff --git a/...examples/line_chart_with_custom_legend.py → ...s_syntax/line_chart_with_custom_legend.py b/...examples/line_chart_with_custom_legend.py → ...s_syntax/line_chart_with_custom_legend.py
diff --git a/altair/examples/line_chart_with_datum.py → ...arguments_syntax/line_chart_with_datum.py b/altair/examples/line_chart_with_datum.py → ...arguments_syntax/line_chart_with_datum.py
diff --git a/altair/examples/line_chart_with_generator.py → ...ments_syntax/line_chart_with_generator.py b/altair/examples/line_chart_with_generator.py → ...ments_syntax/line_chart_with_generator.py
diff --git a/...examples/line_chart_with_interpolation.py → ...s_syntax/line_chart_with_interpolation.py b/...examples/line_chart_with_interpolation.py → ...s_syntax/line_chart_with_interpolation.py
diff --git a/altair/examples/line_chart_with_points.py → ...rguments_syntax/line_chart_with_points.py b/altair/examples/line_chart_with_points.py → ...rguments_syntax/line_chart_with_points.py
diff --git a/...xamples/line_chart_with_points_stroked.py → ..._syntax/line_chart_with_points_stroked.py b/...xamples/line_chart_with_points_stroked.py → ..._syntax/line_chart_with_points_stroked.py
diff --git a/altair/examples/line_percent.py → ...examples_arguments_syntax/line_percent.py b/altair/examples/line_percent.py → ...examples_arguments_syntax/line_percent.py
diff --git a/altair/examples/line_with_ci.py → ...examples_arguments_syntax/line_with_ci.py b/altair/examples/line_with_ci.py → ...examples_arguments_syntax/line_with_ci.py
diff --git a/altair/examples/line_with_last_value_labeled → ...ts_syntax/line_with_last_value_labeled.py b/altair/examples/line_with_last_value_labeled → ...ts_syntax/line_with_last_value_labeled.py
@@ -11,27 +11,25 @@
 source = data.stocks()
 
 # Create a common chart object
-chart = alt.Chart(source).transform_filter(
-    alt.datum.symbol != "IBM"  # A reducation of the dataset to clarify our example. Not required.
-).encode(
-    color=alt.Color("symbol", legend=None)
+# Use `transform_filter` to reduce the dataset to clarify our example. Not required.
+chart = (
+    alt.Chart(source)
+    .transform_filter(alt.datum.symbol != "IBM")
+    .encode(color=alt.Color("symbol", legend=None))
 )
 
 # Draw the line
-line = chart.mark_line().encode(
-    x="date:T",
-    y="price:Q"
-)
+line = chart.mark_line().encode(x="date:T", y="price:Q")
 
 # Use the `argmax` aggregate to limit the dataset to the final value
 label = chart.encode(
-    x=alt.X('max(date):T'),
-    y=alt.Y('price:Q', aggregate=alt.ArgmaxDef(argmax='date')),
-    text='symbol'
+    x=alt.X("max(date):T"),
+    y=alt.Y("price:Q", aggregate=alt.ArgmaxDef(argmax="date")),
+    text="symbol",
 )
 
 # Create a text label
-text = label.mark_text(align='left', dx=4)
+text = label.mark_text(align="left", dx=4)
 
 # Create a circle annotation
 circle = label.mark_circle()

diff --git a/altair/examples/line_with_log_scale.py → ...s_arguments_syntax/line_with_log_scale.py b/altair/examples/line_with_log_scale.py → ...s_arguments_syntax/line_with_log_scale.py
diff --git a/altair/examples/london_tube.py → .../examples_arguments_syntax/london_tube.py b/altair/examples/london_tube.py → .../examples_arguments_syntax/london_tube.py
diff --git a/altair/examples/mosaic_with_labels.py → ...es_arguments_syntax/mosaic_with_labels.py b/altair/examples/mosaic_with_labels.py → ...es_arguments_syntax/mosaic_with_labels.py
diff --git a/altair/examples/multi_series_line.py → ...les_arguments_syntax/multi_series_line.py b/altair/examples/multi_series_line.py → ...les_arguments_syntax/multi_series_line.py
diff --git a/altair/examples/multifeature_scatter_plot.py → ...ments_syntax/multifeature_scatter_plot.py b/altair/examples/multifeature_scatter_plot.py → ...ments_syntax/multifeature_scatter_plot.py
diff --git a/altair/examples/multiline_highlight.py → ...s_arguments_syntax/multiline_highlight.py b/altair/examples/multiline_highlight.py → ...s_arguments_syntax/multiline_highlight.py
diff --git a/altair/examples/multiline_tooltip.py → ...les_arguments_syntax/multiline_tooltip.py b/altair/examples/multiline_tooltip.py → ...les_arguments_syntax/multiline_tooltip.py
diff --git a/altair/examples/multiple_interactions.py → ...arguments_syntax/multiple_interactions.py b/altair/examples/multiple_interactions.py → ...arguments_syntax/multiple_interactions.py
diff --git a/altair/examples/natural_disasters.py → ...les_arguments_syntax/natural_disasters.py b/altair/examples/natural_disasters.py → ...les_arguments_syntax/natural_disasters.py
diff --git a/...examples/normalized_stacked_area_chart.py → ...s_syntax/normalized_stacked_area_chart.py b/...examples/normalized_stacked_area_chart.py → ...s_syntax/normalized_stacked_area_chart.py
diff --git a/.../examples/normalized_stacked_bar_chart.py → ...ts_syntax/normalized_stacked_bar_chart.py b/.../examples/normalized_stacked_bar_chart.py → ...ts_syntax/normalized_stacked_bar_chart.py
diff --git a/...r/examples/normed_parallel_coordinates.py → ...nts_syntax/normed_parallel_coordinates.py b/...r/examples/normed_parallel_coordinates.py → ...nts_syntax/normed_parallel_coordinates.py
diff --git a/altair/examples/one_dot_per_zipcode.py → ...s_arguments_syntax/one_dot_per_zipcode.py b/altair/examples/one_dot_per_zipcode.py → ...s_arguments_syntax/one_dot_per_zipcode.py
diff --git a/altair/examples/pacman_chart.py → ...examples_arguments_syntax/pacman_chart.py b/altair/examples/pacman_chart.py → ...examples_arguments_syntax/pacman_chart.py
diff --git a/altair/examples/parallel_coordinates.py → ..._arguments_syntax/parallel_coordinates.py b/altair/examples/parallel_coordinates.py → ..._arguments_syntax/parallel_coordinates.py
diff --git a/altair/examples/percentage_of_total.py → ...s_arguments_syntax/percentage_of_total.py b/altair/examples/percentage_of_total.py → ...s_arguments_syntax/percentage_of_total.py
diff --git a/altair/examples/pie_chart.py → tests/examples_arguments_syntax/pie_chart.py b/altair/examples/pie_chart.py → tests/examples_arguments_syntax/pie_chart.py
diff --git a/altair/examples/pie_chart_with_labels.py → ...arguments_syntax/pie_chart_with_labels.py b/altair/examples/pie_chart_with_labels.py → ...arguments_syntax/pie_chart_with_labels.py
diff --git a/altair/examples/point_map.py → tests/examples_arguments_syntax/point_map.py b/altair/examples/point_map.py → tests/examples_arguments_syntax/point_map.py
diff --git a/altair/examples/poly_fit_regression.py → ...s_arguments_syntax/poly_fit_regression.py b/altair/examples/poly_fit_regression.py → ...s_arguments_syntax/poly_fit_regression.py
diff --git a/altair/examples/pyramid.py → tests/examples_arguments_syntax/pyramid.py b/altair/examples/pyramid.py → tests/examples_arguments_syntax/pyramid.py
diff --git a/altair/examples/radial_chart.py → ...examples_arguments_syntax/radial_chart.py b/altair/examples/radial_chart.py → ...examples_arguments_syntax/radial_chart.py
diff --git a/altair/examples/ranged_dot_plot.py → ...mples_arguments_syntax/ranged_dot_plot.py b/altair/examples/ranged_dot_plot.py → ...mples_arguments_syntax/ranged_dot_plot.py
diff --git a/altair/examples/ridgeline_plot.py → ...amples_arguments_syntax/ridgeline_plot.py b/altair/examples/ridgeline_plot.py → ...amples_arguments_syntax/ridgeline_plot.py
diff --git a/altair/examples/scatter_href.py → ...examples_arguments_syntax/scatter_href.py b/altair/examples/scatter_href.py → ...examples_arguments_syntax/scatter_href.py
diff --git a/altair/examples/scatter_linked_brush.py → ..._arguments_syntax/scatter_linked_brush.py b/altair/examples/scatter_linked_brush.py → ..._arguments_syntax/scatter_linked_brush.py
diff --git a/altair/examples/scatter_linked_table.py → ..._arguments_syntax/scatter_linked_table.py b/altair/examples/scatter_linked_table.py → ..._arguments_syntax/scatter_linked_table.py
diff --git a/altair/examples/scatter_marginal_hist.py → ...arguments_syntax/scatter_marginal_hist.py b/altair/examples/scatter_marginal_hist.py → ...arguments_syntax/scatter_marginal_hist.py
diff --git a/altair/examples/scatter_matrix.py → ...amples_arguments_syntax/scatter_matrix.py b/altair/examples/scatter_matrix.py → ...amples_arguments_syntax/scatter_matrix.py
diff --git a/altair/examples/scatter_qq.py → ...s/examples_arguments_syntax/scatter_qq.py b/altair/examples/scatter_qq.py → ...s/examples_arguments_syntax/scatter_qq.py
diff --git a/altair/examples/scatter_tooltips.py → ...ples_arguments_syntax/scatter_tooltips.py b/altair/examples/scatter_tooltips.py → ...ples_arguments_syntax/scatter_tooltips.py
diff --git a/altair/examples/scatter_with_histogram.py → ...rguments_syntax/scatter_with_histogram.py b/altair/examples/scatter_with_histogram.py → ...rguments_syntax/scatter_with_histogram.py
diff --git a/altair/examples/scatter_with_labels.py → ...s_arguments_syntax/scatter_with_labels.py b/altair/examples/scatter_with_labels.py → ...s_arguments_syntax/scatter_with_labels.py
diff --git a/...xamples/scatter_with_layered_histogram.py → ..._syntax/scatter_with_layered_histogram.py b/...xamples/scatter_with_layered_histogram.py → ..._syntax/scatter_with_layered_histogram.py
diff --git a/altair/examples/scatter_with_loess.py → ...es_arguments_syntax/scatter_with_loess.py b/altair/examples/scatter_with_loess.py → ...es_arguments_syntax/scatter_with_loess.py
diff --git a/altair/examples/scatter_with_minimap.py → ..._arguments_syntax/scatter_with_minimap.py b/altair/examples/scatter_with_minimap.py → ..._arguments_syntax/scatter_with_minimap.py
diff --git a/altair/examples/scatter_with_rolling_mean.py → ...ments_syntax/scatter_with_rolling_mean.py b/altair/examples/scatter_with_rolling_mean.py → ...ments_syntax/scatter_with_rolling_mean.py
diff --git a/...r/examples/seattle_weather_interactive.py → ...nts_syntax/seattle_weather_interactive.py b/...r/examples/seattle_weather_interactive.py → ...nts_syntax/seattle_weather_interactive.py
diff --git a/altair/examples/select_detail.py → ...xamples_arguments_syntax/select_detail.py b/altair/examples/select_detail.py → ...xamples_arguments_syntax/select_detail.py
diff --git a/altair/examples/select_mark_area.py → ...ples_arguments_syntax/select_mark_area.py b/altair/examples/select_mark_area.py → ...ples_arguments_syntax/select_mark_area.py
diff --git a/altair/examples/selection_histogram.py → ...s_arguments_syntax/selection_histogram.py b/altair/examples/selection_histogram.py → ...s_arguments_syntax/selection_histogram.py
diff --git a/altair/examples/selection_layer_bar_month.py → ...ments_syntax/selection_layer_bar_month.py b/altair/examples/selection_layer_bar_month.py → ...ments_syntax/selection_layer_bar_month.py
diff --git a/altair/examples/simple_bar_chart.py → ...ples_arguments_syntax/simple_bar_chart.py b/altair/examples/simple_bar_chart.py → ...ples_arguments_syntax/simple_bar_chart.py
diff --git a/altair/examples/simple_heatmap.py → ...amples_arguments_syntax/simple_heatmap.py b/altair/examples/simple_heatmap.py → ...amples_arguments_syntax/simple_heatmap.py
diff --git a/altair/examples/simple_histogram.py → ...ples_arguments_syntax/simple_histogram.py b/altair/examples/simple_histogram.py → ...ples_arguments_syntax/simple_histogram.py
diff --git a/altair/examples/simple_line_chart.py → ...les_arguments_syntax/simple_line_chart.py b/altair/examples/simple_line_chart.py → ...les_arguments_syntax/simple_line_chart.py
diff --git a/...examples/simple_scatter_with_errorbars.py → ...s_syntax/simple_scatter_with_errorbars.py b/...examples/simple_scatter_with_errorbars.py → ...s_syntax/simple_scatter_with_errorbars.py
diff --git a/altair/examples/simple_stacked_area_chart.py → ...ments_syntax/simple_stacked_area_chart.py b/altair/examples/simple_stacked_area_chart.py → ...ments_syntax/simple_stacked_area_chart.py
diff --git a/altair/examples/slider_cutoff.py → ...xamples_arguments_syntax/slider_cutoff.py b/altair/examples/slider_cutoff.py → ...xamples_arguments_syntax/slider_cutoff.py
diff --git a/altair/examples/slope_graph.py → .../examples_arguments_syntax/slope_graph.py b/altair/examples/slope_graph.py → .../examples_arguments_syntax/slope_graph.py
diff --git a/altair/examples/sorted_error_bars_with_ci.py → ...ments_syntax/sorted_error_bars_with_ci.py b/altair/examples/sorted_error_bars_with_ci.py → ...ments_syntax/sorted_error_bars_with_ci.py
diff --git a/altair/examples/stacked_bar_chart.py → ...les_arguments_syntax/stacked_bar_chart.py b/altair/examples/stacked_bar_chart.py → ...les_arguments_syntax/stacked_bar_chart.py
diff --git a/...ples/stacked_bar_chart_sorted_segments.py → ...ntax/stacked_bar_chart_sorted_segments.py b/...ples/stacked_bar_chart_sorted_segments.py → ...ntax/stacked_bar_chart_sorted_segments.py
diff --git a/...r/examples/stacked_bar_chart_with_text.py → ...nts_syntax/stacked_bar_chart_with_text.py b/...r/examples/stacked_bar_chart_with_text.py → ...nts_syntax/stacked_bar_chart_with_text.py
diff --git a/altair/examples/stem_and_leaf.py → ...xamples_arguments_syntax/stem_and_leaf.py b/altair/examples/stem_and_leaf.py → ...xamples_arguments_syntax/stem_and_leaf.py
diff --git a/altair/examples/step_chart.py → ...s/examples_arguments_syntax/step_chart.py b/altair/examples/step_chart.py → ...s/examples_arguments_syntax/step_chart.py
diff --git a/altair/examples/streamgraph.py → .../examples_arguments_syntax/streamgraph.py b/altair/examples/streamgraph.py → .../examples_arguments_syntax/streamgraph.py
diff --git a/altair/examples/strip_plot.py → ...s/examples_arguments_syntax/strip_plot.py b/altair/examples/strip_plot.py → ...s/examples_arguments_syntax/strip_plot.py
diff --git a/altair/examples/strip_plot_jitter.py → ...les_arguments_syntax/strip_plot_jitter.py b/altair/examples/strip_plot_jitter.py → ...les_arguments_syntax/strip_plot_jitter.py
diff --git a/altair/examples/table_bubble_plot_github.py → ...uments_syntax/table_bubble_plot_github.py b/altair/examples/table_bubble_plot_github.py → ...uments_syntax/table_bubble_plot_github.py
diff --git a/altair/sphinxext/__init__.py → ...amples_arguments_syntax/tests/__init__.py b/altair/sphinxext/__init__.py → ...amples_arguments_syntax/tests/__init__.py
diff --git a/altair/examples/tests/test_examples.py → ...s_arguments_syntax/tests/test_examples.py b/altair/examples/tests/test_examples.py → ...s_arguments_syntax/tests/test_examples.py
@@ -4,7 +4,7 @@
 import pytest
 
 from altair.utils.execeval import eval_block
-from altair import examples
+from tests import examples_arguments_syntax
 
 try:
     import altair_saver  # noqa: F401
@@ -18,15 +18,17 @@
 
 
 def iter_example_filenames():
-    for importer, modname, ispkg in pkgutil.iter_modules(examples.__path__):
+    for importer, modname, ispkg in pkgutil.iter_modules(
+        examples_arguments_syntax.__path__
+    ):
         if ispkg or modname.startswith("_"):
             continue
         yield modname + ".py"
 
 
 @pytest.mark.parametrize("filename", iter_example_filenames())
 def test_examples(filename: str):
-    source = pkgutil.get_data(examples.__name__, filename)
+    source = pkgutil.get_data(examples_arguments_syntax.__name__, filename)
     chart = eval_block(source)
 
     if chart is None:
@@ -50,7 +52,7 @@ def test_render_examples_to_png(engine, filename):
         if "png" not in altair_saver.available_formats("vega-lite"):
             pytest.skip("altair_saver not configured to save to png")
 
-    source = pkgutil.get_data(examples.__name__, filename)
+    source = pkgutil.get_data(examples_arguments_syntax.__name__, filename)
     chart = eval_block(source)
     out = io.BytesIO()
     chart.save(out, format="png", engine=engine)

diff --git a/altair/examples/top_k_items.py → .../examples_arguments_syntax/top_k_items.py b/altair/examples/top_k_items.py → .../examples_arguments_syntax/top_k_items.py
diff --git a/altair/examples/top_k_letters.py → ...xamples_arguments_syntax/top_k_letters.py b/altair/examples/top_k_letters.py → ...xamples_arguments_syntax/top_k_letters.py
diff --git a/altair/examples/top_k_with_others.py → ...les_arguments_syntax/top_k_with_others.py b/altair/examples/top_k_with_others.py → ...les_arguments_syntax/top_k_with_others.py
diff --git a/altair/examples/trail_marker.py → ...examples_arguments_syntax/trail_marker.py b/altair/examples/trail_marker.py → ...examples_arguments_syntax/trail_marker.py
diff --git a/altair/examples/trellis_area.py → ...examples_arguments_syntax/trellis_area.py b/altair/examples/trellis_area.py → ...examples_arguments_syntax/trellis_area.py
diff --git a/altair/examples/trellis_area_sort_array.py → ...guments_syntax/trellis_area_sort_array.py b/altair/examples/trellis_area_sort_array.py → ...guments_syntax/trellis_area_sort_array.py
diff --git a/altair/examples/trellis_histogram.py → ...les_arguments_syntax/trellis_histogram.py b/altair/examples/trellis_histogram.py → ...les_arguments_syntax/trellis_histogram.py
diff --git a/altair/examples/trellis_scatter_plot.py → ..._arguments_syntax/trellis_scatter_plot.py b/altair/examples/trellis_scatter_plot.py → ..._arguments_syntax/trellis_scatter_plot.py
diff --git a/altair/examples/trellis_stacked_bar_chart.py → ...ments_syntax/trellis_stacked_bar_chart.py b/altair/examples/trellis_stacked_bar_chart.py → ...ments_syntax/trellis_stacked_bar_chart.py
diff --git a/altair/examples/us_employment.py → ...xamples_arguments_syntax/us_employment.py b/altair/examples/us_employment.py → ...xamples_arguments_syntax/us_employment.py
diff --git a/...mples/us_incomebrackets_by_state_facet.py → ...yntax/us_incomebrackets_by_state_facet.py b/...mples/us_incomebrackets_by_state_facet.py → ...yntax/us_incomebrackets_by_state_facet.py
diff --git a/altair/examples/us_population_over_time.py → ...guments_syntax/us_population_over_time.py b/altair/examples/us_population_over_time.py → ...guments_syntax/us_population_over_time.py
diff --git a/...examples/us_population_over_time_facet.py → ...s_syntax/us_population_over_time_facet.py b/...examples/us_population_over_time_facet.py → ...s_syntax/us_population_over_time_facet.py
diff --git a/...amples/us_population_pyramid_over_time.py → ...syntax/us_population_pyramid_over_time.py b/...amples/us_population_pyramid_over_time.py → ...syntax/us_population_pyramid_over_time.py
diff --git a/altair/examples/us_state_capitals.py → ...les_arguments_syntax/us_state_capitals.py b/altair/examples/us_state_capitals.py → ...les_arguments_syntax/us_state_capitals.py
diff --git a/altair/examples/violin_plot.py → .../examples_arguments_syntax/violin_plot.py b/altair/examples/violin_plot.py → .../examples_arguments_syntax/violin_plot.py
diff --git a/altair/examples/waterfall_chart.py → ...mples_arguments_syntax/waterfall_chart.py b/altair/examples/waterfall_chart.py → ...mples_arguments_syntax/waterfall_chart.py
diff --git a/altair/examples/wheat_wages.py → .../examples_arguments_syntax/wheat_wages.py b/altair/examples/wheat_wages.py → .../examples_arguments_syntax/wheat_wages.py
diff --git a/altair/examples/wilkinson-dot-plot.py → ...es_arguments_syntax/wilkinson-dot-plot.py b/altair/examples/wilkinson-dot-plot.py → ...es_arguments_syntax/wilkinson-dot-plot.py
diff --git a/altair/examples/wind_vector_map.py → ...mples_arguments_syntax/wind_vector_map.py b/altair/examples/wind_vector_map.py → ...mples_arguments_syntax/wind_vector_map.py
diff --git a/altair/examples/window_rank.py → .../examples_arguments_syntax/window_rank.py b/altair/examples/window_rank.py → .../examples_arguments_syntax/window_rank.py
diff --git a/altair/examples/world_map.py → tests/examples_arguments_syntax/world_map.py b/altair/examples/world_map.py → tests/examples_arguments_syntax/world_map.py
diff --git a/altair/examples/world_projections.py → ...les_arguments_syntax/world_projections.py b/altair/examples/world_projections.py → ...les_arguments_syntax/world_projections.py
diff --git a/altair/tests/__init__.py → tests/expr/__init__.py b/altair/tests/__init__.py → tests/expr/__init__.py
diff --git a/altair/utils/tests/__init__.py → tests/expr/tests/__init__.py b/altair/utils/tests/__init__.py → tests/expr/tests/__init__.py
diff --git a/altair/expr/tests/test_expr.py → tests/expr/tests/test_expr.py b/altair/expr/tests/test_expr.py → tests/expr/tests/test_expr.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from ... import expr
-from .. import datum
+from altair import expr
+from altair import datum
 
 
 def test_unary_operations():

diff --git a/altair/vega/tests/__init__.py → tests/tests/__init__.py b/altair/vega/tests/__init__.py → tests/tests/__init__.py
diff --git a/altair/tests/test_magics.py → tests/tests/test_magics.py b/altair/tests/test_magics.py → tests/tests/test_magics.py
diff --git a/altair/vegalite/tests/__init__.py → tests/utils/__init__.py b/altair/vegalite/tests/__init__.py → tests/utils/__init__.py
diff --git a/altair/vegalite/v3/tests/__init__.py → tests/utils/tests/__init__.py b/altair/vegalite/v3/tests/__init__.py → tests/utils/tests/__init__.py
diff --git a/altair/utils/tests/test_core.py → tests/utils/tests/test_core.py b/altair/utils/tests/test_core.py → tests/utils/tests/test_core.py
@@ -5,8 +5,8 @@
 import pytest
 
 import altair as alt
-from .. import parse_shorthand, update_nested, infer_encoding_types
-from ..core import infer_dtype
+from altair.utils.core import parse_shorthand, update_nested, infer_encoding_types
+from altair.utils.core import infer_dtype
 
 FAKE_CHANNELS_MODULE = '''
 """Fake channels module for utility tests."""

diff --git a/altair/utils/tests/test_data.py → tests/utils/tests/test_data.py b/altair/utils/tests/test_data.py → tests/utils/tests/test_data.py
@@ -4,7 +4,14 @@
 import pandas as pd
 from toolz import pipe
 
-from ..data import limit_rows, MaxRowsError, sample, to_values, to_json, to_csv
+from altair.utils.data import (
+    limit_rows,
+    MaxRowsError,
+    sample,
+    to_values,
+    to_json,
+    to_csv,
+)
 
 
 def _create_dataframe(N):

diff --git a/altair/utils/tests/test_deprecation.py → tests/utils/tests/test_deprecation.py b/altair/utils/tests/test_deprecation.py → tests/utils/tests/test_deprecation.py
diff --git a/altair/utils/tests/test_execeval.py → tests/utils/tests/test_execeval.py b/altair/utils/tests/test_execeval.py → tests/utils/tests/test_execeval.py
@@ -1,4 +1,4 @@
-from ..execeval import eval_block
+from altair.utils.execeval import eval_block
 
 HAS_RETURN = """
 x = 4

diff --git a/altair/utils/tests/test_html.py → tests/utils/tests/test_html.py b/altair/utils/tests/test_html.py → tests/utils/tests/test_html.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ..html import spec_to_html
+from altair.utils.html import spec_to_html
 
 
 @pytest.fixture

diff --git a/altair/utils/tests/test_mimebundle.py → tests/utils/tests/test_mimebundle.py b/altair/utils/tests/test_mimebundle.py → tests/utils/tests/test_mimebundle.py
@@ -1,7 +1,7 @@
 import pytest
 
 import altair as alt
-from ..mimebundle import spec_to_mimebundle
+from altair.utils.mimebundle import spec_to_mimebundle
 
 try:
     import altair_saver  # noqa: F401

diff --git a/altair/utils/tests/test_plugin_registry.py → tests/utils/tests/test_plugin_registry.py b/altair/utils/tests/test_plugin_registry.py → tests/utils/tests/test_plugin_registry.py
@@ -1,4 +1,4 @@
-from ..plugin_registry import PluginRegistry
+from altair.utils.plugin_registry import PluginRegistry
 from typing import Callable
 
 

diff --git a/altair/utils/tests/test_schemapi.py → tests/utils/tests/test_schemapi.py b/altair/utils/tests/test_schemapi.py → tests/utils/tests/test_schemapi.py
@@ -9,7 +9,7 @@
 
 import numpy as np
 
-from ..schemapi import (
+from altair.utils.schemapi import (
     UndefinedType,
     SchemaBase,
     Undefined,

diff --git a/altair/utils/tests/test_server.py → tests/utils/tests/test_server.py b/altair/utils/tests/test_server.py → tests/utils/tests/test_server.py
diff --git a/altair/utils/tests/test_utils.py → tests/utils/tests/test_utils.py b/altair/utils/tests/test_utils.py → tests/utils/tests/test_utils.py
@@ -5,7 +5,7 @@
 import numpy as np
 import pandas as pd
 
-from .. import infer_vegalite_type, sanitize_dataframe
+from altair.utils import infer_vegalite_type, sanitize_dataframe
 
 
 def test_infer_vegalite_type():

diff --git a/altair/vegalite/v4/tests/__init__.py → tests/vega/__init__.py b/altair/vegalite/v4/tests/__init__.py → tests/vega/__init__.py
diff --git a/altair/vegalite/v5/tests/__init__.py → tests/vega/tests/__init__.py b/altair/vegalite/v5/tests/__init__.py → tests/vega/tests/__init__.py
diff --git a/altair/vega/tests/test_import.py → tests/vega/tests/test_import.py b/altair/vega/tests/test_import.py → tests/vega/tests/test_import.py
diff --git a/tests/vegalite/__init__.py b/tests/vegalite/__init__.py
diff --git a/tests/vegalite/tests/__init__.py b/tests/vegalite/tests/__init__.py
diff --git a/altair/vegalite/tests/test_common.py → tests/vegalite/tests/test_common.py b/altair/vegalite/tests/test_common.py → tests/vegalite/tests/test_common.py
@@ -4,7 +4,7 @@
 
 import pandas as pd
 
-from .. import v3, v4, v5
+from altair.vegalite import v3, v4, v5
 
 
 @pytest.fixture

diff --git a/tests/vegalite/v3/__init__.py b/tests/vegalite/v3/__init__.py
diff --git a/tests/vegalite/v3/tests/__init__.py b/tests/vegalite/v3/tests/__init__.py
diff --git a/altair/vegalite/v3/tests/test_api.py → tests/vegalite/v3/tests/test_api.py b/altair/vegalite/v3/tests/test_api.py → tests/vegalite/v3/tests/test_api.py
diff --git a/altair/vegalite/v5/tests/test_data.py → tests/vegalite/v3/tests/test_data.py b/altair/vegalite/v5/tests/test_data.py → tests/vegalite/v3/tests/test_data.py
@@ -3,7 +3,7 @@
 import pandas as pd
 import pytest
 
-from .. import data as alt
+from altair.vegalite.v3 import data as alt
 
 
 @pytest.fixture

diff --git a/altair/vegalite/v3/tests/test_display.py → tests/vegalite/v3/tests/test_display.py b/altair/vegalite/v3/tests/test_display.py → tests/vegalite/v3/tests/test_display.py
diff --git a/...r/vegalite/v3/tests/test_geo_interface.py → ...s/vegalite/v3/tests/test_geo_interface.py b/...r/vegalite/v3/tests/test_geo_interface.py → ...s/vegalite/v3/tests/test_geo_interface.py
diff --git a/altair/vegalite/v3/tests/test_renderers.py → tests/vegalite/v3/tests/test_renderers.py b/altair/vegalite/v3/tests/test_renderers.py → tests/vegalite/v3/tests/test_renderers.py
diff --git a/altair/vegalite/v3/tests/test_theme.py → tests/vegalite/v3/tests/test_theme.py b/altair/vegalite/v3/tests/test_theme.py → tests/vegalite/v3/tests/test_theme.py
diff --git a/tests/vegalite/v4/__init__.py b/tests/vegalite/v4/__init__.py
diff --git a/tests/vegalite/v4/tests/__init__.py b/tests/vegalite/v4/tests/__init__.py
diff --git a/altair/vegalite/v4/tests/test_api.py → tests/vegalite/v4/tests/test_api.py b/altair/vegalite/v4/tests/test_api.py → tests/vegalite/v4/tests/test_api.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ docutils @@
     ipython
     flake8
     pytest
+    pytest-cov
     sphinx
     mistune<2.0.0  # necessary for m2r v0.2
     m2r
@@ Expand Down @@