From 5100d835341776d0242ff07c3e610e6a161f933d Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 17:47:25 -0500 Subject: [PATCH 1/7] move all files into a subpackage directory --- {.changes => dbt-spark/.changes}/0.0.0.md | 0 {.changes => dbt-spark/.changes}/README.md | 0 {.changes => dbt-spark/.changes}/header.tpl.md | 0 {.changes => dbt-spark/.changes}/unreleased/.gitkeep | 0 .../.changes}/unreleased/Under the Hood-20241207-181814.yaml | 0 .changie.yaml => dbt-spark/.changie.yaml | 0 CHANGELOG.md => dbt-spark/CHANGELOG.md | 0 CONTRIBUTING.md => dbt-spark/CONTRIBUTING.md | 0 License.md => dbt-spark/License.md | 0 README.md => dbt-spark/README.md | 0 {dagger => dbt-spark/dagger}/requirements.txt | 0 {dagger => dbt-spark/dagger}/run_dbt_spark_tests.py | 0 {dagger => dbt-spark/dagger}/scripts/configure_odbc.sh | 0 {dagger => dbt-spark/dagger}/scripts/install_os_reqs.sh | 0 {dagger => dbt-spark/dagger}/spark-container/entrypoint.sh | 0 {dagger => dbt-spark/dagger}/spark-container/hive-site.xml | 0 {dagger => dbt-spark/dagger}/spark-container/install_spark.sh | 0 {dagger => dbt-spark/dagger}/spark-container/spark-defaults.conf | 0 docker-compose.yml => dbt-spark/docker-compose.yml | 0 {docker => dbt-spark/docker}/Dockerfile | 0 {docker => dbt-spark/docker}/README.md | 0 {docker => dbt-spark/docker}/entrypoint.sh | 0 {docker => dbt-spark/docker}/hive-site.xml | 0 {docker => dbt-spark/docker}/spark-defaults.conf | 0 {docker => dbt-spark/docker}/spark.Dockerfile | 0 hatch.toml => dbt-spark/hatch.toml | 0 pyproject.toml => dbt-spark/pyproject.toml | 0 {scripts => dbt-spark/scripts}/build-dist.sh | 0 {.github => dbt-spark}/scripts/update_dependencies.sh | 0 {.github => dbt-spark}/scripts/update_dev_dependency_branches.sh | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/__init__.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/__version__.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/column.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/connections.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/impl.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/python_submissions.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/relation.py | 0 {dbt => dbt-spark/src/dbt}/adapters/spark/session.py | 0 {dbt => dbt-spark/src/dbt}/include/spark/__init__.py | 0 {dbt => dbt-spark/src/dbt}/include/spark/dbt_project.yml | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/adapters.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/apply_grants.sql | 0 .../src/dbt}/include/spark/macros/materializations/clone.sql | 0 .../spark/macros/materializations/incremental/column_helpers.sql | 0 .../spark/macros/materializations/incremental/incremental.sql | 0 .../spark/macros/materializations/incremental/strategies.sql | 0 .../spark/macros/materializations/incremental/validate.sql | 0 .../src/dbt}/include/spark/macros/materializations/seed.sql | 0 .../src/dbt}/include/spark/macros/materializations/snapshot.sql | 0 .../src/dbt}/include/spark/macros/materializations/table.sql | 0 .../src/dbt}/include/spark/macros/materializations/view.sql | 0 .../src/dbt}/include/spark/macros/utils/any_value.sql | 0 .../src/dbt}/include/spark/macros/utils/array_append.sql | 0 .../src/dbt}/include/spark/macros/utils/array_concat.sql | 0 .../src/dbt}/include/spark/macros/utils/array_construct.sql | 0 .../src/dbt}/include/spark/macros/utils/assert_not_null.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/bool_or.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/concat.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/date.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/dateadd.sql | 0 .../src/dbt}/include/spark/macros/utils/datediff.sql | 0 .../src/dbt}/include/spark/macros/utils/escape_single_quotes.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/listagg.sql | 0 .../src/dbt}/include/spark/macros/utils/safe_cast.sql | 0 .../src/dbt}/include/spark/macros/utils/split_part.sql | 0 .../src/dbt}/include/spark/macros/utils/timestamps.sql | 0 {dbt => dbt-spark/src/dbt}/include/spark/profile_template.yml | 0 test.env.example => dbt-spark/test.env.example | 0 {tests => dbt-spark/tests}/__init__.py | 0 {tests => dbt-spark/tests}/conftest.py | 0 .../tests}/functional/adapter/dbt_clone/fixtures.py | 0 .../tests}/functional/adapter/dbt_clone/test_dbt_clone.py | 0 .../tests}/functional/adapter/dbt_show/test_dbt_show.py | 0 {tests => dbt-spark/tests}/functional/adapter/empty/test_empty.py | 0 .../adapter/incremental/test_incremental_merge_exclude_columns.py | 0 .../adapter/incremental/test_incremental_on_schema_change.py | 0 .../functional/adapter/incremental/test_incremental_predicates.py | 0 .../functional/adapter/incremental/test_incremental_unique_id.py | 0 .../tests}/functional/adapter/incremental_strategies/fixtures.py | 0 .../tests}/functional/adapter/incremental_strategies/seeds.py | 0 .../adapter/incremental_strategies/test_incremental_strategies.py | 0 .../functional/adapter/incremental_strategies/test_microbatch.py | 0 .../tests}/functional/adapter/persist_docs/fixtures.py | 0 .../tests}/functional/adapter/persist_docs/test_persist_docs.py | 0 .../tests}/functional/adapter/seed_column_types/fixtures.py | 0 .../adapter/seed_column_types/test_seed_column_types.py | 0 {tests => dbt-spark/tests}/functional/adapter/test_basic.py | 0 {tests => dbt-spark/tests}/functional/adapter/test_constraints.py | 0 .../tests}/functional/adapter/test_get_columns_in_relation.py | 0 {tests => dbt-spark/tests}/functional/adapter/test_grants.py | 0 .../tests}/functional/adapter/test_python_model.py | 0 {tests => dbt-spark/tests}/functional/adapter/test_simple_seed.py | 0 .../tests}/functional/adapter/test_store_test_failures.py | 0 .../tests}/functional/adapter/unit_testing/test_unit_testing.py | 0 .../tests}/functional/adapter/utils/fixture_listagg.py | 0 .../tests}/functional/adapter/utils/test_data_types.py | 0 .../tests}/functional/adapter/utils/test_timestamps.py | 0 {tests => dbt-spark/tests}/functional/adapter/utils/test_utils.py | 0 {tests => dbt-spark/tests}/functional/conftest.py | 0 {tests => dbt-spark/tests}/unit/__init__.py | 0 {tests => dbt-spark/tests}/unit/conftest.py | 0 {tests => dbt-spark/tests}/unit/fixtures/__init__.py | 0 {tests => dbt-spark/tests}/unit/fixtures/profiles.py | 0 {tests => dbt-spark/tests}/unit/test_adapter.py | 0 {tests => dbt-spark/tests}/unit/test_column.py | 0 {tests => dbt-spark/tests}/unit/test_credentials.py | 0 {tests => dbt-spark/tests}/unit/test_macros.py | 0 {tests => dbt-spark/tests}/unit/utils.py | 0 108 files changed, 0 insertions(+), 0 deletions(-) rename {.changes => dbt-spark/.changes}/0.0.0.md (100%) rename {.changes => dbt-spark/.changes}/README.md (100%) rename {.changes => dbt-spark/.changes}/header.tpl.md (100%) rename {.changes => dbt-spark/.changes}/unreleased/.gitkeep (100%) rename {.changes => dbt-spark/.changes}/unreleased/Under the Hood-20241207-181814.yaml (100%) rename .changie.yaml => dbt-spark/.changie.yaml (100%) rename CHANGELOG.md => dbt-spark/CHANGELOG.md (100%) rename CONTRIBUTING.md => dbt-spark/CONTRIBUTING.md (100%) rename License.md => dbt-spark/License.md (100%) rename README.md => dbt-spark/README.md (100%) rename {dagger => dbt-spark/dagger}/requirements.txt (100%) rename {dagger => dbt-spark/dagger}/run_dbt_spark_tests.py (100%) rename {dagger => dbt-spark/dagger}/scripts/configure_odbc.sh (100%) rename {dagger => dbt-spark/dagger}/scripts/install_os_reqs.sh (100%) rename {dagger => dbt-spark/dagger}/spark-container/entrypoint.sh (100%) rename {dagger => dbt-spark/dagger}/spark-container/hive-site.xml (100%) rename {dagger => dbt-spark/dagger}/spark-container/install_spark.sh (100%) rename {dagger => dbt-spark/dagger}/spark-container/spark-defaults.conf (100%) rename docker-compose.yml => dbt-spark/docker-compose.yml (100%) rename {docker => dbt-spark/docker}/Dockerfile (100%) rename {docker => dbt-spark/docker}/README.md (100%) rename {docker => dbt-spark/docker}/entrypoint.sh (100%) rename {docker => dbt-spark/docker}/hive-site.xml (100%) rename {docker => dbt-spark/docker}/spark-defaults.conf (100%) rename {docker => dbt-spark/docker}/spark.Dockerfile (100%) rename hatch.toml => dbt-spark/hatch.toml (100%) rename pyproject.toml => dbt-spark/pyproject.toml (100%) rename {scripts => dbt-spark/scripts}/build-dist.sh (100%) rename {.github => dbt-spark}/scripts/update_dependencies.sh (100%) rename {.github => dbt-spark}/scripts/update_dev_dependency_branches.sh (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/__init__.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/__version__.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/column.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/connections.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/impl.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/python_submissions.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/relation.py (100%) rename {dbt => dbt-spark/src/dbt}/adapters/spark/session.py (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/__init__.py (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/dbt_project.yml (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/adapters.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/apply_grants.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/clone.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/incremental/column_helpers.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/incremental/incremental.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/incremental/strategies.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/incremental/validate.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/seed.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/snapshot.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/table.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/materializations/view.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/any_value.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/array_append.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/array_concat.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/array_construct.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/assert_not_null.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/bool_or.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/concat.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/date.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/dateadd.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/datediff.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/escape_single_quotes.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/listagg.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/safe_cast.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/split_part.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/macros/utils/timestamps.sql (100%) rename {dbt => dbt-spark/src/dbt}/include/spark/profile_template.yml (100%) rename test.env.example => dbt-spark/test.env.example (100%) rename {tests => dbt-spark/tests}/__init__.py (100%) rename {tests => dbt-spark/tests}/conftest.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/dbt_clone/fixtures.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/dbt_clone/test_dbt_clone.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/dbt_show/test_dbt_show.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/empty/test_empty.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental/test_incremental_merge_exclude_columns.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental/test_incremental_on_schema_change.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental/test_incremental_predicates.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental/test_incremental_unique_id.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental_strategies/fixtures.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental_strategies/seeds.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental_strategies/test_incremental_strategies.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/incremental_strategies/test_microbatch.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/persist_docs/fixtures.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/persist_docs/test_persist_docs.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/seed_column_types/fixtures.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/seed_column_types/test_seed_column_types.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_basic.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_constraints.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_get_columns_in_relation.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_grants.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_python_model.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_simple_seed.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/test_store_test_failures.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/unit_testing/test_unit_testing.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/utils/fixture_listagg.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/utils/test_data_types.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/utils/test_timestamps.py (100%) rename {tests => dbt-spark/tests}/functional/adapter/utils/test_utils.py (100%) rename {tests => dbt-spark/tests}/functional/conftest.py (100%) rename {tests => dbt-spark/tests}/unit/__init__.py (100%) rename {tests => dbt-spark/tests}/unit/conftest.py (100%) rename {tests => dbt-spark/tests}/unit/fixtures/__init__.py (100%) rename {tests => dbt-spark/tests}/unit/fixtures/profiles.py (100%) rename {tests => dbt-spark/tests}/unit/test_adapter.py (100%) rename {tests => dbt-spark/tests}/unit/test_column.py (100%) rename {tests => dbt-spark/tests}/unit/test_credentials.py (100%) rename {tests => dbt-spark/tests}/unit/test_macros.py (100%) rename {tests => dbt-spark/tests}/unit/utils.py (100%) diff --git a/.changes/0.0.0.md b/dbt-spark/.changes/0.0.0.md similarity index 100% rename from .changes/0.0.0.md rename to dbt-spark/.changes/0.0.0.md diff --git a/.changes/README.md b/dbt-spark/.changes/README.md similarity index 100% rename from .changes/README.md rename to dbt-spark/.changes/README.md diff --git a/.changes/header.tpl.md b/dbt-spark/.changes/header.tpl.md similarity index 100% rename from .changes/header.tpl.md rename to dbt-spark/.changes/header.tpl.md diff --git a/.changes/unreleased/.gitkeep b/dbt-spark/.changes/unreleased/.gitkeep similarity index 100% rename from .changes/unreleased/.gitkeep rename to dbt-spark/.changes/unreleased/.gitkeep diff --git a/.changes/unreleased/Under the Hood-20241207-181814.yaml b/dbt-spark/.changes/unreleased/Under the Hood-20241207-181814.yaml similarity index 100% rename from .changes/unreleased/Under the Hood-20241207-181814.yaml rename to dbt-spark/.changes/unreleased/Under the Hood-20241207-181814.yaml diff --git a/.changie.yaml b/dbt-spark/.changie.yaml similarity index 100% rename from .changie.yaml rename to dbt-spark/.changie.yaml diff --git a/CHANGELOG.md b/dbt-spark/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to dbt-spark/CHANGELOG.md diff --git a/CONTRIBUTING.md b/dbt-spark/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to dbt-spark/CONTRIBUTING.md diff --git a/License.md b/dbt-spark/License.md similarity index 100% rename from License.md rename to dbt-spark/License.md diff --git a/README.md b/dbt-spark/README.md similarity index 100% rename from README.md rename to dbt-spark/README.md diff --git a/dagger/requirements.txt b/dbt-spark/dagger/requirements.txt similarity index 100% rename from dagger/requirements.txt rename to dbt-spark/dagger/requirements.txt diff --git a/dagger/run_dbt_spark_tests.py b/dbt-spark/dagger/run_dbt_spark_tests.py similarity index 100% rename from dagger/run_dbt_spark_tests.py rename to dbt-spark/dagger/run_dbt_spark_tests.py diff --git a/dagger/scripts/configure_odbc.sh b/dbt-spark/dagger/scripts/configure_odbc.sh similarity index 100% rename from dagger/scripts/configure_odbc.sh rename to dbt-spark/dagger/scripts/configure_odbc.sh diff --git a/dagger/scripts/install_os_reqs.sh b/dbt-spark/dagger/scripts/install_os_reqs.sh similarity index 100% rename from dagger/scripts/install_os_reqs.sh rename to dbt-spark/dagger/scripts/install_os_reqs.sh diff --git a/dagger/spark-container/entrypoint.sh b/dbt-spark/dagger/spark-container/entrypoint.sh similarity index 100% rename from dagger/spark-container/entrypoint.sh rename to dbt-spark/dagger/spark-container/entrypoint.sh diff --git a/dagger/spark-container/hive-site.xml b/dbt-spark/dagger/spark-container/hive-site.xml similarity index 100% rename from dagger/spark-container/hive-site.xml rename to dbt-spark/dagger/spark-container/hive-site.xml diff --git a/dagger/spark-container/install_spark.sh b/dbt-spark/dagger/spark-container/install_spark.sh similarity index 100% rename from dagger/spark-container/install_spark.sh rename to dbt-spark/dagger/spark-container/install_spark.sh diff --git a/dagger/spark-container/spark-defaults.conf b/dbt-spark/dagger/spark-container/spark-defaults.conf similarity index 100% rename from dagger/spark-container/spark-defaults.conf rename to dbt-spark/dagger/spark-container/spark-defaults.conf diff --git a/docker-compose.yml b/dbt-spark/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to dbt-spark/docker-compose.yml diff --git a/docker/Dockerfile b/dbt-spark/docker/Dockerfile similarity index 100% rename from docker/Dockerfile rename to dbt-spark/docker/Dockerfile diff --git a/docker/README.md b/dbt-spark/docker/README.md similarity index 100% rename from docker/README.md rename to dbt-spark/docker/README.md diff --git a/docker/entrypoint.sh b/dbt-spark/docker/entrypoint.sh similarity index 100% rename from docker/entrypoint.sh rename to dbt-spark/docker/entrypoint.sh diff --git a/docker/hive-site.xml b/dbt-spark/docker/hive-site.xml similarity index 100% rename from docker/hive-site.xml rename to dbt-spark/docker/hive-site.xml diff --git a/docker/spark-defaults.conf b/dbt-spark/docker/spark-defaults.conf similarity index 100% rename from docker/spark-defaults.conf rename to dbt-spark/docker/spark-defaults.conf diff --git a/docker/spark.Dockerfile b/dbt-spark/docker/spark.Dockerfile similarity index 100% rename from docker/spark.Dockerfile rename to dbt-spark/docker/spark.Dockerfile diff --git a/hatch.toml b/dbt-spark/hatch.toml similarity index 100% rename from hatch.toml rename to dbt-spark/hatch.toml diff --git a/pyproject.toml b/dbt-spark/pyproject.toml similarity index 100% rename from pyproject.toml rename to dbt-spark/pyproject.toml diff --git a/scripts/build-dist.sh b/dbt-spark/scripts/build-dist.sh similarity index 100% rename from scripts/build-dist.sh rename to dbt-spark/scripts/build-dist.sh diff --git a/.github/scripts/update_dependencies.sh b/dbt-spark/scripts/update_dependencies.sh similarity index 100% rename from .github/scripts/update_dependencies.sh rename to dbt-spark/scripts/update_dependencies.sh diff --git a/.github/scripts/update_dev_dependency_branches.sh b/dbt-spark/scripts/update_dev_dependency_branches.sh similarity index 100% rename from .github/scripts/update_dev_dependency_branches.sh rename to dbt-spark/scripts/update_dev_dependency_branches.sh diff --git a/dbt/adapters/spark/__init__.py b/dbt-spark/src/dbt/adapters/spark/__init__.py similarity index 100% rename from dbt/adapters/spark/__init__.py rename to dbt-spark/src/dbt/adapters/spark/__init__.py diff --git a/dbt/adapters/spark/__version__.py b/dbt-spark/src/dbt/adapters/spark/__version__.py similarity index 100% rename from dbt/adapters/spark/__version__.py rename to dbt-spark/src/dbt/adapters/spark/__version__.py diff --git a/dbt/adapters/spark/column.py b/dbt-spark/src/dbt/adapters/spark/column.py similarity index 100% rename from dbt/adapters/spark/column.py rename to dbt-spark/src/dbt/adapters/spark/column.py diff --git a/dbt/adapters/spark/connections.py b/dbt-spark/src/dbt/adapters/spark/connections.py similarity index 100% rename from dbt/adapters/spark/connections.py rename to dbt-spark/src/dbt/adapters/spark/connections.py diff --git a/dbt/adapters/spark/impl.py b/dbt-spark/src/dbt/adapters/spark/impl.py similarity index 100% rename from dbt/adapters/spark/impl.py rename to dbt-spark/src/dbt/adapters/spark/impl.py diff --git a/dbt/adapters/spark/python_submissions.py b/dbt-spark/src/dbt/adapters/spark/python_submissions.py similarity index 100% rename from dbt/adapters/spark/python_submissions.py rename to dbt-spark/src/dbt/adapters/spark/python_submissions.py diff --git a/dbt/adapters/spark/relation.py b/dbt-spark/src/dbt/adapters/spark/relation.py similarity index 100% rename from dbt/adapters/spark/relation.py rename to dbt-spark/src/dbt/adapters/spark/relation.py diff --git a/dbt/adapters/spark/session.py b/dbt-spark/src/dbt/adapters/spark/session.py similarity index 100% rename from dbt/adapters/spark/session.py rename to dbt-spark/src/dbt/adapters/spark/session.py diff --git a/dbt/include/spark/__init__.py b/dbt-spark/src/dbt/include/spark/__init__.py similarity index 100% rename from dbt/include/spark/__init__.py rename to dbt-spark/src/dbt/include/spark/__init__.py diff --git a/dbt/include/spark/dbt_project.yml b/dbt-spark/src/dbt/include/spark/dbt_project.yml similarity index 100% rename from dbt/include/spark/dbt_project.yml rename to dbt-spark/src/dbt/include/spark/dbt_project.yml diff --git a/dbt/include/spark/macros/adapters.sql b/dbt-spark/src/dbt/include/spark/macros/adapters.sql similarity index 100% rename from dbt/include/spark/macros/adapters.sql rename to dbt-spark/src/dbt/include/spark/macros/adapters.sql diff --git a/dbt/include/spark/macros/apply_grants.sql b/dbt-spark/src/dbt/include/spark/macros/apply_grants.sql similarity index 100% rename from dbt/include/spark/macros/apply_grants.sql rename to dbt-spark/src/dbt/include/spark/macros/apply_grants.sql diff --git a/dbt/include/spark/macros/materializations/clone.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/clone.sql similarity index 100% rename from dbt/include/spark/macros/materializations/clone.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/clone.sql diff --git a/dbt/include/spark/macros/materializations/incremental/column_helpers.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/incremental/column_helpers.sql similarity index 100% rename from dbt/include/spark/macros/materializations/incremental/column_helpers.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/incremental/column_helpers.sql diff --git a/dbt/include/spark/macros/materializations/incremental/incremental.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/incremental/incremental.sql similarity index 100% rename from dbt/include/spark/macros/materializations/incremental/incremental.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/incremental/incremental.sql diff --git a/dbt/include/spark/macros/materializations/incremental/strategies.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/incremental/strategies.sql similarity index 100% rename from dbt/include/spark/macros/materializations/incremental/strategies.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/incremental/strategies.sql diff --git a/dbt/include/spark/macros/materializations/incremental/validate.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/incremental/validate.sql similarity index 100% rename from dbt/include/spark/macros/materializations/incremental/validate.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/incremental/validate.sql diff --git a/dbt/include/spark/macros/materializations/seed.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/seed.sql similarity index 100% rename from dbt/include/spark/macros/materializations/seed.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/seed.sql diff --git a/dbt/include/spark/macros/materializations/snapshot.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/snapshot.sql similarity index 100% rename from dbt/include/spark/macros/materializations/snapshot.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/snapshot.sql diff --git a/dbt/include/spark/macros/materializations/table.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/table.sql similarity index 100% rename from dbt/include/spark/macros/materializations/table.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/table.sql diff --git a/dbt/include/spark/macros/materializations/view.sql b/dbt-spark/src/dbt/include/spark/macros/materializations/view.sql similarity index 100% rename from dbt/include/spark/macros/materializations/view.sql rename to dbt-spark/src/dbt/include/spark/macros/materializations/view.sql diff --git a/dbt/include/spark/macros/utils/any_value.sql b/dbt-spark/src/dbt/include/spark/macros/utils/any_value.sql similarity index 100% rename from dbt/include/spark/macros/utils/any_value.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/any_value.sql diff --git a/dbt/include/spark/macros/utils/array_append.sql b/dbt-spark/src/dbt/include/spark/macros/utils/array_append.sql similarity index 100% rename from dbt/include/spark/macros/utils/array_append.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/array_append.sql diff --git a/dbt/include/spark/macros/utils/array_concat.sql b/dbt-spark/src/dbt/include/spark/macros/utils/array_concat.sql similarity index 100% rename from dbt/include/spark/macros/utils/array_concat.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/array_concat.sql diff --git a/dbt/include/spark/macros/utils/array_construct.sql b/dbt-spark/src/dbt/include/spark/macros/utils/array_construct.sql similarity index 100% rename from dbt/include/spark/macros/utils/array_construct.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/array_construct.sql diff --git a/dbt/include/spark/macros/utils/assert_not_null.sql b/dbt-spark/src/dbt/include/spark/macros/utils/assert_not_null.sql similarity index 100% rename from dbt/include/spark/macros/utils/assert_not_null.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/assert_not_null.sql diff --git a/dbt/include/spark/macros/utils/bool_or.sql b/dbt-spark/src/dbt/include/spark/macros/utils/bool_or.sql similarity index 100% rename from dbt/include/spark/macros/utils/bool_or.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/bool_or.sql diff --git a/dbt/include/spark/macros/utils/concat.sql b/dbt-spark/src/dbt/include/spark/macros/utils/concat.sql similarity index 100% rename from dbt/include/spark/macros/utils/concat.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/concat.sql diff --git a/dbt/include/spark/macros/utils/date.sql b/dbt-spark/src/dbt/include/spark/macros/utils/date.sql similarity index 100% rename from dbt/include/spark/macros/utils/date.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/date.sql diff --git a/dbt/include/spark/macros/utils/dateadd.sql b/dbt-spark/src/dbt/include/spark/macros/utils/dateadd.sql similarity index 100% rename from dbt/include/spark/macros/utils/dateadd.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/dateadd.sql diff --git a/dbt/include/spark/macros/utils/datediff.sql b/dbt-spark/src/dbt/include/spark/macros/utils/datediff.sql similarity index 100% rename from dbt/include/spark/macros/utils/datediff.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/datediff.sql diff --git a/dbt/include/spark/macros/utils/escape_single_quotes.sql b/dbt-spark/src/dbt/include/spark/macros/utils/escape_single_quotes.sql similarity index 100% rename from dbt/include/spark/macros/utils/escape_single_quotes.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/escape_single_quotes.sql diff --git a/dbt/include/spark/macros/utils/listagg.sql b/dbt-spark/src/dbt/include/spark/macros/utils/listagg.sql similarity index 100% rename from dbt/include/spark/macros/utils/listagg.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/listagg.sql diff --git a/dbt/include/spark/macros/utils/safe_cast.sql b/dbt-spark/src/dbt/include/spark/macros/utils/safe_cast.sql similarity index 100% rename from dbt/include/spark/macros/utils/safe_cast.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/safe_cast.sql diff --git a/dbt/include/spark/macros/utils/split_part.sql b/dbt-spark/src/dbt/include/spark/macros/utils/split_part.sql similarity index 100% rename from dbt/include/spark/macros/utils/split_part.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/split_part.sql diff --git a/dbt/include/spark/macros/utils/timestamps.sql b/dbt-spark/src/dbt/include/spark/macros/utils/timestamps.sql similarity index 100% rename from dbt/include/spark/macros/utils/timestamps.sql rename to dbt-spark/src/dbt/include/spark/macros/utils/timestamps.sql diff --git a/dbt/include/spark/profile_template.yml b/dbt-spark/src/dbt/include/spark/profile_template.yml similarity index 100% rename from dbt/include/spark/profile_template.yml rename to dbt-spark/src/dbt/include/spark/profile_template.yml diff --git a/test.env.example b/dbt-spark/test.env.example similarity index 100% rename from test.env.example rename to dbt-spark/test.env.example diff --git a/tests/__init__.py b/dbt-spark/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to dbt-spark/tests/__init__.py diff --git a/tests/conftest.py b/dbt-spark/tests/conftest.py similarity index 100% rename from tests/conftest.py rename to dbt-spark/tests/conftest.py diff --git a/tests/functional/adapter/dbt_clone/fixtures.py b/dbt-spark/tests/functional/adapter/dbt_clone/fixtures.py similarity index 100% rename from tests/functional/adapter/dbt_clone/fixtures.py rename to dbt-spark/tests/functional/adapter/dbt_clone/fixtures.py diff --git a/tests/functional/adapter/dbt_clone/test_dbt_clone.py b/dbt-spark/tests/functional/adapter/dbt_clone/test_dbt_clone.py similarity index 100% rename from tests/functional/adapter/dbt_clone/test_dbt_clone.py rename to dbt-spark/tests/functional/adapter/dbt_clone/test_dbt_clone.py diff --git a/tests/functional/adapter/dbt_show/test_dbt_show.py b/dbt-spark/tests/functional/adapter/dbt_show/test_dbt_show.py similarity index 100% rename from tests/functional/adapter/dbt_show/test_dbt_show.py rename to dbt-spark/tests/functional/adapter/dbt_show/test_dbt_show.py diff --git a/tests/functional/adapter/empty/test_empty.py b/dbt-spark/tests/functional/adapter/empty/test_empty.py similarity index 100% rename from tests/functional/adapter/empty/test_empty.py rename to dbt-spark/tests/functional/adapter/empty/test_empty.py diff --git a/tests/functional/adapter/incremental/test_incremental_merge_exclude_columns.py b/dbt-spark/tests/functional/adapter/incremental/test_incremental_merge_exclude_columns.py similarity index 100% rename from tests/functional/adapter/incremental/test_incremental_merge_exclude_columns.py rename to dbt-spark/tests/functional/adapter/incremental/test_incremental_merge_exclude_columns.py diff --git a/tests/functional/adapter/incremental/test_incremental_on_schema_change.py b/dbt-spark/tests/functional/adapter/incremental/test_incremental_on_schema_change.py similarity index 100% rename from tests/functional/adapter/incremental/test_incremental_on_schema_change.py rename to dbt-spark/tests/functional/adapter/incremental/test_incremental_on_schema_change.py diff --git a/tests/functional/adapter/incremental/test_incremental_predicates.py b/dbt-spark/tests/functional/adapter/incremental/test_incremental_predicates.py similarity index 100% rename from tests/functional/adapter/incremental/test_incremental_predicates.py rename to dbt-spark/tests/functional/adapter/incremental/test_incremental_predicates.py diff --git a/tests/functional/adapter/incremental/test_incremental_unique_id.py b/dbt-spark/tests/functional/adapter/incremental/test_incremental_unique_id.py similarity index 100% rename from tests/functional/adapter/incremental/test_incremental_unique_id.py rename to dbt-spark/tests/functional/adapter/incremental/test_incremental_unique_id.py diff --git a/tests/functional/adapter/incremental_strategies/fixtures.py b/dbt-spark/tests/functional/adapter/incremental_strategies/fixtures.py similarity index 100% rename from tests/functional/adapter/incremental_strategies/fixtures.py rename to dbt-spark/tests/functional/adapter/incremental_strategies/fixtures.py diff --git a/tests/functional/adapter/incremental_strategies/seeds.py b/dbt-spark/tests/functional/adapter/incremental_strategies/seeds.py similarity index 100% rename from tests/functional/adapter/incremental_strategies/seeds.py rename to dbt-spark/tests/functional/adapter/incremental_strategies/seeds.py diff --git a/tests/functional/adapter/incremental_strategies/test_incremental_strategies.py b/dbt-spark/tests/functional/adapter/incremental_strategies/test_incremental_strategies.py similarity index 100% rename from tests/functional/adapter/incremental_strategies/test_incremental_strategies.py rename to dbt-spark/tests/functional/adapter/incremental_strategies/test_incremental_strategies.py diff --git a/tests/functional/adapter/incremental_strategies/test_microbatch.py b/dbt-spark/tests/functional/adapter/incremental_strategies/test_microbatch.py similarity index 100% rename from tests/functional/adapter/incremental_strategies/test_microbatch.py rename to dbt-spark/tests/functional/adapter/incremental_strategies/test_microbatch.py diff --git a/tests/functional/adapter/persist_docs/fixtures.py b/dbt-spark/tests/functional/adapter/persist_docs/fixtures.py similarity index 100% rename from tests/functional/adapter/persist_docs/fixtures.py rename to dbt-spark/tests/functional/adapter/persist_docs/fixtures.py diff --git a/tests/functional/adapter/persist_docs/test_persist_docs.py b/dbt-spark/tests/functional/adapter/persist_docs/test_persist_docs.py similarity index 100% rename from tests/functional/adapter/persist_docs/test_persist_docs.py rename to dbt-spark/tests/functional/adapter/persist_docs/test_persist_docs.py diff --git a/tests/functional/adapter/seed_column_types/fixtures.py b/dbt-spark/tests/functional/adapter/seed_column_types/fixtures.py similarity index 100% rename from tests/functional/adapter/seed_column_types/fixtures.py rename to dbt-spark/tests/functional/adapter/seed_column_types/fixtures.py diff --git a/tests/functional/adapter/seed_column_types/test_seed_column_types.py b/dbt-spark/tests/functional/adapter/seed_column_types/test_seed_column_types.py similarity index 100% rename from tests/functional/adapter/seed_column_types/test_seed_column_types.py rename to dbt-spark/tests/functional/adapter/seed_column_types/test_seed_column_types.py diff --git a/tests/functional/adapter/test_basic.py b/dbt-spark/tests/functional/adapter/test_basic.py similarity index 100% rename from tests/functional/adapter/test_basic.py rename to dbt-spark/tests/functional/adapter/test_basic.py diff --git a/tests/functional/adapter/test_constraints.py b/dbt-spark/tests/functional/adapter/test_constraints.py similarity index 100% rename from tests/functional/adapter/test_constraints.py rename to dbt-spark/tests/functional/adapter/test_constraints.py diff --git a/tests/functional/adapter/test_get_columns_in_relation.py b/dbt-spark/tests/functional/adapter/test_get_columns_in_relation.py similarity index 100% rename from tests/functional/adapter/test_get_columns_in_relation.py rename to dbt-spark/tests/functional/adapter/test_get_columns_in_relation.py diff --git a/tests/functional/adapter/test_grants.py b/dbt-spark/tests/functional/adapter/test_grants.py similarity index 100% rename from tests/functional/adapter/test_grants.py rename to dbt-spark/tests/functional/adapter/test_grants.py diff --git a/tests/functional/adapter/test_python_model.py b/dbt-spark/tests/functional/adapter/test_python_model.py similarity index 100% rename from tests/functional/adapter/test_python_model.py rename to dbt-spark/tests/functional/adapter/test_python_model.py diff --git a/tests/functional/adapter/test_simple_seed.py b/dbt-spark/tests/functional/adapter/test_simple_seed.py similarity index 100% rename from tests/functional/adapter/test_simple_seed.py rename to dbt-spark/tests/functional/adapter/test_simple_seed.py diff --git a/tests/functional/adapter/test_store_test_failures.py b/dbt-spark/tests/functional/adapter/test_store_test_failures.py similarity index 100% rename from tests/functional/adapter/test_store_test_failures.py rename to dbt-spark/tests/functional/adapter/test_store_test_failures.py diff --git a/tests/functional/adapter/unit_testing/test_unit_testing.py b/dbt-spark/tests/functional/adapter/unit_testing/test_unit_testing.py similarity index 100% rename from tests/functional/adapter/unit_testing/test_unit_testing.py rename to dbt-spark/tests/functional/adapter/unit_testing/test_unit_testing.py diff --git a/tests/functional/adapter/utils/fixture_listagg.py b/dbt-spark/tests/functional/adapter/utils/fixture_listagg.py similarity index 100% rename from tests/functional/adapter/utils/fixture_listagg.py rename to dbt-spark/tests/functional/adapter/utils/fixture_listagg.py diff --git a/tests/functional/adapter/utils/test_data_types.py b/dbt-spark/tests/functional/adapter/utils/test_data_types.py similarity index 100% rename from tests/functional/adapter/utils/test_data_types.py rename to dbt-spark/tests/functional/adapter/utils/test_data_types.py diff --git a/tests/functional/adapter/utils/test_timestamps.py b/dbt-spark/tests/functional/adapter/utils/test_timestamps.py similarity index 100% rename from tests/functional/adapter/utils/test_timestamps.py rename to dbt-spark/tests/functional/adapter/utils/test_timestamps.py diff --git a/tests/functional/adapter/utils/test_utils.py b/dbt-spark/tests/functional/adapter/utils/test_utils.py similarity index 100% rename from tests/functional/adapter/utils/test_utils.py rename to dbt-spark/tests/functional/adapter/utils/test_utils.py diff --git a/tests/functional/conftest.py b/dbt-spark/tests/functional/conftest.py similarity index 100% rename from tests/functional/conftest.py rename to dbt-spark/tests/functional/conftest.py diff --git a/tests/unit/__init__.py b/dbt-spark/tests/unit/__init__.py similarity index 100% rename from tests/unit/__init__.py rename to dbt-spark/tests/unit/__init__.py diff --git a/tests/unit/conftest.py b/dbt-spark/tests/unit/conftest.py similarity index 100% rename from tests/unit/conftest.py rename to dbt-spark/tests/unit/conftest.py diff --git a/tests/unit/fixtures/__init__.py b/dbt-spark/tests/unit/fixtures/__init__.py similarity index 100% rename from tests/unit/fixtures/__init__.py rename to dbt-spark/tests/unit/fixtures/__init__.py diff --git a/tests/unit/fixtures/profiles.py b/dbt-spark/tests/unit/fixtures/profiles.py similarity index 100% rename from tests/unit/fixtures/profiles.py rename to dbt-spark/tests/unit/fixtures/profiles.py diff --git a/tests/unit/test_adapter.py b/dbt-spark/tests/unit/test_adapter.py similarity index 100% rename from tests/unit/test_adapter.py rename to dbt-spark/tests/unit/test_adapter.py diff --git a/tests/unit/test_column.py b/dbt-spark/tests/unit/test_column.py similarity index 100% rename from tests/unit/test_column.py rename to dbt-spark/tests/unit/test_column.py diff --git a/tests/unit/test_credentials.py b/dbt-spark/tests/unit/test_credentials.py similarity index 100% rename from tests/unit/test_credentials.py rename to dbt-spark/tests/unit/test_credentials.py diff --git a/tests/unit/test_macros.py b/dbt-spark/tests/unit/test_macros.py similarity index 100% rename from tests/unit/test_macros.py rename to dbt-spark/tests/unit/test_macros.py diff --git a/tests/unit/utils.py b/dbt-spark/tests/unit/utils.py similarity index 100% rename from tests/unit/utils.py rename to dbt-spark/tests/unit/utils.py From 9c2143b32e191141a2e51960f6c9bfaa4a9e09cd Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 17:52:00 -0500 Subject: [PATCH 2/7] fix project metadata --- dbt-spark/hatch.toml | 8 +++++--- dbt-spark/pyproject.toml | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dbt-spark/hatch.toml b/dbt-spark/hatch.toml index 55a51c7cb..638bba83c 100644 --- a/dbt-spark/hatch.toml +++ b/dbt-spark/hatch.toml @@ -1,11 +1,13 @@ [version] -path = "dbt/adapters/spark/__version__.py" +path = "src/dbt/adapters/spark/__version__.py" [build.targets.sdist] -packages = ["dbt"] +packages = ["src/dbt"] +sources = ["src"] [build.targets.wheel] -packages = ["dbt"] +packages = ["src/dbt"] +sources = ["src"] [envs.default] dependencies = [ diff --git a/dbt-spark/pyproject.toml b/dbt-spark/pyproject.toml index 4079e0af5..de27f9cb2 100644 --- a/dbt-spark/pyproject.toml +++ b/dbt-spark/pyproject.toml @@ -53,8 +53,7 @@ Changelog = "https://github.com/dbt-labs/dbt-spark/blob/main/CHANGELOG.md" [tool.pytest.ini_options] testpaths = ["tests/functional", "tests/unit"] env_files = ["test.env"] -addopts = "-v -n auto" -color = true +addopts = "-v --color=yes -n auto" filterwarnings = [ "ignore:.*'soft_unicode' has been renamed to 'soft_str'*:DeprecationWarning", "ignore:unclosed file .*:ResourceWarning", From 6cecedd677fe52e48af2035d574bdcd1433d6850 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 18:00:28 -0500 Subject: [PATCH 3/7] update workflows for the new subpackage directory --- .github/workflows/changelog-existence.yml | 5 ++--- .github/workflows/integration.yml | 5 ++++- .github/workflows/main.yml | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/changelog-existence.yml b/.github/workflows/changelog-existence.yml index 6e51e8afc..19fa8e0fc 100644 --- a/.github/workflows/changelog-existence.yml +++ b/.github/workflows/changelog-existence.yml @@ -34,8 +34,7 @@ permissions: jobs: changelog: - uses: dbt-labs/actions/.github/workflows/changelog-existence.yml@main + uses: dbt-labs/dbt-adapters/.github/workflows/_changelog-entry-check.yml@main with: - changelog_comment: 'Thank you for your pull request! We could not find a changelog entry for this change. For details on how to document a change, see the [dbt-spark contributing guide](https://github.com/dbt-labs/dbt-spark/blob/main/CONTRIBUTING.MD).' - skip_label: 'Skip Changelog' + pull-request: ${{ github.event.pull_request.number }} secrets: inherit # this is only acceptable because we own the action we're calling diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 870ac13b3..a0a6db336 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -129,17 +129,20 @@ jobs: - name: Update Adapters and Core branches (update dev_requirements.txt) if: github.event_name == 'workflow_dispatch' run: | - ./.github/scripts/update_dev_dependency_branches.sh \ + scripts/update_dev_dependency_branches.sh \ ${{ inputs.dbt_adapters_branch }} \ ${{ inputs.dbt_core_branch }} \ ${{ inputs.dbt_common_branch }} cat hatch.toml + working-directory: ./dbt-spark - name: Install hatch uses: pypa/hatch@install - name: Install python dependencies run: hatch run pip install -r dagger/requirements.txt + working-directory: ./dbt-spark - name: Run tests for ${{ matrix.test }} run: hatch run integration-tests --profile ${{ matrix.test }} + working-directory: ./dbt-spark diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 458048a7f..0eee34819 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,6 +78,7 @@ jobs: uses: pypa/hatch@install - run: hatch run unit-tests + working-directory: ./dbt-spark build: name: build packages @@ -100,12 +101,15 @@ jobs: - name: Build distributions run: hatch build + working-directory: ./dbt-spark - name: Show distributions run: ls -lh dist/ + working-directory: ./dbt-spark - name: Check distribution descriptions run: hatch run build:check-all + working-directory: ./dbt-spark - name: Check if this is an alpha version id: check-is-alpha @@ -113,12 +117,14 @@ jobs: export is_alpha=0 if [[ "$(ls -lh dist/)" == *"a1"* ]]; then export is_alpha=1; fi echo "is_alpha=$is_alpha" >> $GITHUB_OUTPUT + working-directory: ./dbt-spark - uses: actions/upload-artifact@v4 with: name: dist path: dist/ overwrite: true + working-directory: ./dbt-spark test-build: name: verify packages / python ${{ matrix.python-version }} / ${{ matrix.os }} / ${{ matrix.dist-type }} From fdb99c2d99b932b38878bb6747962ee304649679 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 18:47:07 -0500 Subject: [PATCH 4/7] fix upload path --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0eee34819..ca6957dd0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -122,9 +122,8 @@ jobs: - uses: actions/upload-artifact@v4 with: name: dist - path: dist/ + path: dbt-spark/dist/ overwrite: true - working-directory: ./dbt-spark test-build: name: verify packages / python ${{ matrix.python-version }} / ${{ matrix.os }} / ${{ matrix.dist-type }} From 9e40b94c3e8c76f5a3fd36d103ed29900116098d Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 18:55:51 -0500 Subject: [PATCH 5/7] update unit tests with new src path --- dbt-spark/tests/unit/test_macros.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt-spark/tests/unit/test_macros.py b/dbt-spark/tests/unit/test_macros.py index 5b648a079..67c452756 100644 --- a/dbt-spark/tests/unit/test_macros.py +++ b/dbt-spark/tests/unit/test_macros.py @@ -7,7 +7,7 @@ class TestSparkMacros(unittest.TestCase): def setUp(self): self.jinja_env = Environment( - loader=FileSystemLoader("dbt/include/spark/macros"), + loader=FileSystemLoader("src/dbt/include/spark/macros"), extensions=[ "jinja2.ext.do", ], From 34400e52dccbd1519e49692b758dedaca9e28d54 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 19:02:13 -0500 Subject: [PATCH 6/7] update host directory for dagger to include src directory --- dbt-spark/dagger/run_dbt_spark_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt-spark/dagger/run_dbt_spark_tests.py b/dbt-spark/dagger/run_dbt_spark_tests.py index f1efb434c..c1e46acf1 100644 --- a/dbt-spark/dagger/run_dbt_spark_tests.py +++ b/dbt-spark/dagger/run_dbt_spark_tests.py @@ -108,7 +108,7 @@ async def test_spark(test_args): # copy project files into image tst_container = ( tst_container.with_workdir("/") - .with_directory("/src/dbt", client.host().directory("./dbt")) + .with_directory("/src/dbt", client.host().directory("./src/dbt")) .with_directory("/src/tests", client.host().directory("./tests")) .with_directory( "/src", From 10e061ecdb33d4106c71e73215259f22db6e2550 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Mon, 6 Jan 2025 19:08:33 -0500 Subject: [PATCH 7/7] update host directory for dagger to include src directory --- dbt-spark/dagger/run_dbt_spark_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt-spark/dagger/run_dbt_spark_tests.py b/dbt-spark/dagger/run_dbt_spark_tests.py index c1e46acf1..d6a0f7019 100644 --- a/dbt-spark/dagger/run_dbt_spark_tests.py +++ b/dbt-spark/dagger/run_dbt_spark_tests.py @@ -108,7 +108,7 @@ async def test_spark(test_args): # copy project files into image tst_container = ( tst_container.with_workdir("/") - .with_directory("/src/dbt", client.host().directory("./src/dbt")) + .with_directory("/src/src/dbt", client.host().directory("./src/dbt")) .with_directory("/src/tests", client.host().directory("./tests")) .with_directory( "/src",