From ad9a261bcab87ab8f626700bc982178fb9d91c58 Mon Sep 17 00:00:00 2001 From: Stefan Binder Date: Sat, 18 May 2024 09:47:04 +0200 Subject: [PATCH] ci: remove again geopandas pin and disable flaky test (#3422) * ci: remove again geopandas pin and disable flaky test * Move exclusion to hopefully correct place --- pyproject.toml | 6 +++++- tests/examples_arguments_syntax/__init__.py | 2 +- tests/examples_methods_syntax/__init__.py | 2 +- tests/test_examples.py | 8 +++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fdc9704f8..33a80d13d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ dev = [ "pandas-stubs", "types-jsonschema", "types-setuptools", - "geopandas<=0.14.3", + "geopandas", ] doc = [ "sphinx", @@ -205,6 +205,10 @@ max-complexity = 18 markers = [ "save_engine: marks some of the tests which are using an external package to save a chart to e.g. a png file. This mark is used to run those tests selectively in the build GitHub Action.", ] +# Pytest does not need to search these folders for test functions. +# They contain examples which are being executed by the +# test_examples tests. +norecursedirs = ["tests/examples_arguments_syntax", "tests/examples_methods_syntax"] [tool.mypy] warn_unused_ignores = true diff --git a/tests/examples_arguments_syntax/__init__.py b/tests/examples_arguments_syntax/__init__.py index 3a7f2d486..1f04beca8 100644 --- a/tests/examples_arguments_syntax/__init__.py +++ b/tests/examples_arguments_syntax/__init__.py @@ -23,5 +23,5 @@ def iter_examples_arguments_syntax(): yield { "name": name, "filename": os.path.join(examples_arguments_syntax_dir, filename), - "use_svg": name in SVG_EXAMPLES + "use_svg": name in SVG_EXAMPLES, } diff --git a/tests/examples_methods_syntax/__init__.py b/tests/examples_methods_syntax/__init__.py index 1ab784763..51d84ba2d 100644 --- a/tests/examples_methods_syntax/__init__.py +++ b/tests/examples_methods_syntax/__init__.py @@ -21,5 +21,5 @@ def iter_examples_methods_syntax(): yield { "name": name, "filename": os.path.join(examples_methods_syntax_dir, filename), - "use_svg": name in SVG_EXAMPLES + "use_svg": name in SVG_EXAMPLES, } diff --git a/tests/test_examples.py b/tests/test_examples.py index da5808067..4a1a2ed08 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -21,7 +21,13 @@ def iter_examples_filenames(syntax_module): for _importer, modname, ispkg in pkgutil.iter_modules(syntax_module.__path__): - if ispkg or modname.startswith("_"): + if ( + ispkg + or modname.startswith("_") + # Temporarily skip this test until https://github.com/vega/altair/issues/3418 + # is fixed + or modname == "interval_selection_map_quakes" + ): continue yield modname + ".py"