From 5a1c68782b3804c1252f04130fd95a6dcf182e6a Mon Sep 17 00:00:00 2001 From: Michelle Ark Date: Tue, 13 Dec 2022 17:05:23 -0500 Subject: [PATCH] run functional + adapter tests prior to test/integration --- core/dbt/cli/params.py | 4 ++-- core/dbt/cli/requires.py | 4 ++-- tox.ini | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/dbt/cli/params.py b/core/dbt/cli/params.py index 3405a8fde46..a4119426895 100644 --- a/core/dbt/cli/params.py +++ b/core/dbt/cli/params.py @@ -214,7 +214,7 @@ "--profiles-dir", envvar="DBT_PROFILES_DIR", help="Which directory to look in for the profiles.yml file. If not set, dbt will look in the current working directory first, then HOME/.dbt/", - default=lambda: default_profiles_dir(), + default=default_profiles_dir, type=click.Path(exists=True), ) @@ -222,7 +222,7 @@ "--project-dir", envvar=None, help="Which directory to look in for the dbt_project.yml file. Default is the current working directory and its parents.", - default=lambda: default_project_dir(), + default=default_project_dir, type=click.Path(exists=True), ) diff --git a/core/dbt/cli/requires.py b/core/dbt/cli/requires.py index d9db7dfd67f..1bf4abe1779 100644 --- a/core/dbt/cli/requires.py +++ b/core/dbt/cli/requires.py @@ -50,7 +50,7 @@ def wrapper(*args, **kwargs): if ctx.obj.get("profile") is None: flags = ctx.obj["flags"] - # TODO: Generalize safe access to flags.THREADS: + # TODO: Generalize safe access to flags.THREADS: # https://github.com/dbt-labs/dbt-core/issues/6259 threads = getattr(flags, "THREADS", None) profile = load_profile( @@ -82,4 +82,4 @@ def wrapper(*args, **kwargs): return func(*args, **kwargs) - return wrapper \ No newline at end of file + return wrapper diff --git a/tox.ini b/tox.ini index 84fc54c5957..c77b9f92272 100644 --- a/tox.ini +++ b/tox.ini @@ -25,9 +25,10 @@ passenv = POSTGRES_TEST_* PYTEST_ADDOPTS commands = - {envpython} -m pytest --cov=core -m profile_postgres {posargs} test/integration {envpython} -m pytest --cov=core {posargs} tests/functional {envpython} -m pytest --cov=core {posargs} tests/adapter + {envpython} -m pytest --cov=core -m profile_postgres {posargs} test/integration + deps = -rdev-requirements.txt