diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/plugin_base.py | 13 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/pytestplugin.py | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 8e5113954..494e7d5ab 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -136,6 +136,13 @@ def setup_options(make_option): "mark expression", ) make_option( + "--nomypy", + action="callback", + zeroarg_callback=_set_tag_exclude("mypy"), + help="Don't run mypy typing tests; " + "this is now equivalent to the pytest -m 'not mypy' mark expression", + ) + make_option( "--profile-sort", type=str, default="cumulative", @@ -260,10 +267,12 @@ def restore_important_follower_config(dict_): """ -def read_config(): +def read_config(root_path): global file_config file_config = configparser.ConfigParser() - file_config.read(["setup.cfg", "test.cfg"]) + file_config.read( + [str(root_path / "setup.cfg"), str(root_path / "test.cfg")] + ) def pre_begin(opt): diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index cea07b305..0a70f4008 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -69,10 +69,10 @@ def pytest_addoption(parser): group.addoption(name, **kw) plugin_base.setup_options(make_option) - plugin_base.read_config() -def pytest_configure(config): +def pytest_configure(config: pytest.Config): + plugin_base.read_config(config.rootpath) if plugin_base.exclude_tags or plugin_base.include_tags: new_expr = " and ".join( list(plugin_base.include_tags) |
