diff --git a/dagger/run_dbt_spark_tests.py b/dagger/run_dbt_spark_tests.py index 7adb352a2..512bb755b 100644 --- a/dagger/run_dbt_spark_tests.py +++ b/dagger/run_dbt_spark_tests.py @@ -86,7 +86,7 @@ async def get_spark_container(client: dagger.Client) -> (dagger.Container, str): async def test_spark(test_args): async with dagger.Connection(dagger.Config(log_output=sys.stderr)) as client: test_profile = test_args.profile - req_files = client.host().directory("./", include=["*.txt", "*.env", "*.ini"]) + req_files = client.host().directory("./", include=["*.txt", "*.env", "*.ini", "*.md", "setup.py"]) dbt_spark_dir = client.host().directory("./dbt") test_dir = client.host().directory("./tests") scripts = client.host().directory("./dagger/scripts") @@ -99,6 +99,7 @@ async def test_spark(test_args): .with_directory("/tests", test_dir) .with_directory("/scripts", scripts) .with_exec("./scripts/install_os_reqs.sh") + .with_exec(["pip", "install", "-e", "."]) .with_exec(["pip", "install", "-r", "requirements.txt"]) .with_exec(["pip", "install", "-r", "dev-requirements.txt"]) ) diff --git a/dev-requirements.txt b/dev-requirements.txt index 3dd8eb727..e56b221c7 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ # install latest changes in dbt-core # TODO: how to automate switching from develop to version branches? -git+https://github.com/dbt-labs/dbt-core.git@er/remove-common-req-keep-legacy-logger#egg=dbt-core&subdirectory=core -git+https://github.com/dbt-labs/dbt-core.git@er/remove-common-req-keep-legacy-logger#egg=dbt-tests-adapter&subdirectory=tests/adapter +git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core +git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory=tests/adapter # if version 1.x or greater -> pin to major version # if version 0.x -> pin to minor diff --git a/setup.py b/setup.py index 8e839c842..6d2a14686 100644 --- a/setup.py +++ b/setup.py @@ -74,6 +74,7 @@ def _get_dbt_core_version(): install_requires=[ "sqlparams>=3.0.0", "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git#egg=dbt", + "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git#egg=dbt", ], extras_require={ "ODBC": odbc_extras,