ADAP-1122: Move dbt-spark into a namespace subpackage (#1168)

* move all files into a subpackage directory * fix project metadata * update workflows for the new subpackage directory * update unit tests with new src path * update host directory for dagger to include src directory
dbt-labs · Jan 7, 2025 · 489da19 · 489da19
1 parent 0247ad9
commit 489da19
Show file tree

Hide file tree

Showing 111 changed files with 20 additions and 12 deletions.
diff --git 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
@@ -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
@@ -78,6 +78,7 @@ jobs:
         uses: pypa/hatch@install
 
       - run: hatch run unit-tests
+        working-directory: ./dbt-spark
 
   build:
     name: build packages
@@ -100,24 +101,28 @@ 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
         run: |
           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/
+          path: dbt-spark/dist/
           overwrite: true
 
   test-build:

diff --git a/.changes/0.0.0.md → dbt-spark/.changes/0.0.0.md b/.changes/0.0.0.md → dbt-spark/.changes/0.0.0.md
diff --git a/.changes/README.md → dbt-spark/.changes/README.md b/.changes/README.md → dbt-spark/.changes/README.md
diff --git a/.changes/header.tpl.md → dbt-spark/.changes/header.tpl.md b/.changes/header.tpl.md → dbt-spark/.changes/header.tpl.md
diff --git a/.changes/unreleased/.gitkeep → dbt-spark/.changes/unreleased/.gitkeep b/.changes/unreleased/.gitkeep → dbt-spark/.changes/unreleased/.gitkeep
diff --git a/...eased/Under the Hood-20241207-181814.yaml → ...eased/Under the Hood-20241207-181814.yaml b/...eased/Under the Hood-20241207-181814.yaml → ...eased/Under the Hood-20241207-181814.yaml
diff --git a/.changie.yaml → dbt-spark/.changie.yaml b/.changie.yaml → dbt-spark/.changie.yaml
diff --git a/CHANGELOG.md → dbt-spark/CHANGELOG.md b/CHANGELOG.md → dbt-spark/CHANGELOG.md
diff --git a/CONTRIBUTING.md → dbt-spark/CONTRIBUTING.md b/CONTRIBUTING.md → dbt-spark/CONTRIBUTING.md
diff --git a/License.md → dbt-spark/License.md b/License.md → dbt-spark/License.md
diff --git a/README.md → dbt-spark/README.md b/README.md → dbt-spark/README.md
diff --git a/dagger/requirements.txt → dbt-spark/dagger/requirements.txt b/dagger/requirements.txt → dbt-spark/dagger/requirements.txt
diff --git a/dagger/run_dbt_spark_tests.py → dbt-spark/dagger/run_dbt_spark_tests.py b/dagger/run_dbt_spark_tests.py → 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/src/dbt", client.host().directory("./src/dbt"))
             .with_directory("/src/tests", client.host().directory("./tests"))
             .with_directory(
                 "/src",

diff --git a/dagger/scripts/configure_odbc.sh → dbt-spark/dagger/scripts/configure_odbc.sh b/dagger/scripts/configure_odbc.sh → dbt-spark/dagger/scripts/configure_odbc.sh
diff --git a/dagger/scripts/install_os_reqs.sh → dbt-spark/dagger/scripts/install_os_reqs.sh b/dagger/scripts/install_os_reqs.sh → dbt-spark/dagger/scripts/install_os_reqs.sh
diff --git a/dagger/spark-container/entrypoint.sh → ...park/dagger/spark-container/entrypoint.sh b/dagger/spark-container/entrypoint.sh → ...park/dagger/spark-container/entrypoint.sh
diff --git a/dagger/spark-container/hive-site.xml → ...park/dagger/spark-container/hive-site.xml b/dagger/spark-container/hive-site.xml → ...park/dagger/spark-container/hive-site.xml
diff --git a/dagger/spark-container/install_spark.sh → ...k/dagger/spark-container/install_spark.sh b/dagger/spark-container/install_spark.sh → ...k/dagger/spark-container/install_spark.sh
diff --git a/dagger/spark-container/spark-defaults.conf → ...agger/spark-container/spark-defaults.conf b/dagger/spark-container/spark-defaults.conf → ...agger/spark-container/spark-defaults.conf
diff --git a/docker-compose.yml → dbt-spark/docker-compose.yml b/docker-compose.yml → dbt-spark/docker-compose.yml
diff --git a/docker/Dockerfile → dbt-spark/docker/Dockerfile b/docker/Dockerfile → dbt-spark/docker/Dockerfile
diff --git a/docker/README.md → dbt-spark/docker/README.md b/docker/README.md → dbt-spark/docker/README.md
diff --git a/docker/entrypoint.sh → dbt-spark/docker/entrypoint.sh b/docker/entrypoint.sh → dbt-spark/docker/entrypoint.sh
diff --git a/docker/hive-site.xml → dbt-spark/docker/hive-site.xml b/docker/hive-site.xml → dbt-spark/docker/hive-site.xml
diff --git a/docker/spark-defaults.conf → dbt-spark/docker/spark-defaults.conf b/docker/spark-defaults.conf → dbt-spark/docker/spark-defaults.conf
diff --git a/docker/spark.Dockerfile → dbt-spark/docker/spark.Dockerfile b/docker/spark.Dockerfile → dbt-spark/docker/spark.Dockerfile
diff --git a/hatch.toml → dbt-spark/hatch.toml b/hatch.toml → 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/pyproject.toml → dbt-spark/pyproject.toml b/pyproject.toml → 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",

diff --git a/scripts/build-dist.sh → dbt-spark/scripts/build-dist.sh b/scripts/build-dist.sh → dbt-spark/scripts/build-dist.sh
diff --git a/.github/scripts/update_dependencies.sh → dbt-spark/scripts/update_dependencies.sh b/.github/scripts/update_dependencies.sh → dbt-spark/scripts/update_dependencies.sh
diff --git a/...scripts/update_dev_dependency_branches.sh → ...scripts/update_dev_dependency_branches.sh b/...scripts/update_dev_dependency_branches.sh → ...scripts/update_dev_dependency_branches.sh
diff --git a/dbt/adapters/spark/__init__.py → dbt-spark/src/dbt/adapters/spark/__init__.py b/dbt/adapters/spark/__init__.py → dbt-spark/src/dbt/adapters/spark/__init__.py
diff --git a/dbt/adapters/spark/__version__.py → ...ark/src/dbt/adapters/spark/__version__.py b/dbt/adapters/spark/__version__.py → ...ark/src/dbt/adapters/spark/__version__.py
diff --git a/dbt/adapters/spark/column.py → dbt-spark/src/dbt/adapters/spark/column.py b/dbt/adapters/spark/column.py → dbt-spark/src/dbt/adapters/spark/column.py
diff --git a/dbt/adapters/spark/connections.py → ...ark/src/dbt/adapters/spark/connections.py b/dbt/adapters/spark/connections.py → ...ark/src/dbt/adapters/spark/connections.py
diff --git a/dbt/adapters/spark/impl.py → dbt-spark/src/dbt/adapters/spark/impl.py b/dbt/adapters/spark/impl.py → dbt-spark/src/dbt/adapters/spark/impl.py
diff --git a/dbt/adapters/spark/python_submissions.py → .../dbt/adapters/spark/python_submissions.py b/dbt/adapters/spark/python_submissions.py → .../dbt/adapters/spark/python_submissions.py
diff --git a/dbt/adapters/spark/relation.py → dbt-spark/src/dbt/adapters/spark/relation.py b/dbt/adapters/spark/relation.py → dbt-spark/src/dbt/adapters/spark/relation.py
diff --git a/dbt/adapters/spark/session.py → dbt-spark/src/dbt/adapters/spark/session.py b/dbt/adapters/spark/session.py → dbt-spark/src/dbt/adapters/spark/session.py
diff --git a/dbt/include/spark/__init__.py → dbt-spark/src/dbt/include/spark/__init__.py b/dbt/include/spark/__init__.py → dbt-spark/src/dbt/include/spark/__init__.py
diff --git a/dbt/include/spark/dbt_project.yml → ...ark/src/dbt/include/spark/dbt_project.yml b/dbt/include/spark/dbt_project.yml → ...ark/src/dbt/include/spark/dbt_project.yml
diff --git a/dbt/include/spark/macros/adapters.sql → ...src/dbt/include/spark/macros/adapters.sql b/dbt/include/spark/macros/adapters.sql → ...src/dbt/include/spark/macros/adapters.sql
diff --git a/dbt/include/spark/macros/apply_grants.sql → ...dbt/include/spark/macros/apply_grants.sql b/dbt/include/spark/macros/apply_grants.sql → ...dbt/include/spark/macros/apply_grants.sql
diff --git a/...e/spark/macros/materializations/clone.sql → ...e/spark/macros/materializations/clone.sql b/...e/spark/macros/materializations/clone.sql → ...e/spark/macros/materializations/clone.sql
diff --git a/...alizations/incremental/column_helpers.sql → ...alizations/incremental/column_helpers.sql b/...alizations/incremental/column_helpers.sql → ...alizations/incremental/column_helpers.sql
diff --git a/...erializations/incremental/incremental.sql → ...erializations/incremental/incremental.sql b/...erializations/incremental/incremental.sql → ...erializations/incremental/incremental.sql
diff --git a/...terializations/incremental/strategies.sql → ...terializations/incremental/strategies.sql b/...terializations/incremental/strategies.sql → ...terializations/incremental/strategies.sql
diff --git a/...materializations/incremental/validate.sql → ...materializations/incremental/validate.sql b/...materializations/incremental/validate.sql → ...materializations/incremental/validate.sql
diff --git a/...de/spark/macros/materializations/seed.sql → ...de/spark/macros/materializations/seed.sql b/...de/spark/macros/materializations/seed.sql → ...de/spark/macros/materializations/seed.sql
diff --git a/...park/macros/materializations/snapshot.sql → ...park/macros/materializations/snapshot.sql b/...park/macros/materializations/snapshot.sql → ...park/macros/materializations/snapshot.sql
diff --git a/...e/spark/macros/materializations/table.sql → ...e/spark/macros/materializations/table.sql b/...e/spark/macros/materializations/table.sql → ...e/spark/macros/materializations/table.sql
diff --git a/...de/spark/macros/materializations/view.sql → ...de/spark/macros/materializations/view.sql b/...de/spark/macros/materializations/view.sql → ...de/spark/macros/materializations/view.sql
diff --git a/dbt/include/spark/macros/utils/any_value.sql → .../include/spark/macros/utils/any_value.sql b/dbt/include/spark/macros/utils/any_value.sql → .../include/spark/macros/utils/any_value.sql
diff --git a/...clude/spark/macros/utils/array_append.sql → ...clude/spark/macros/utils/array_append.sql b/...clude/spark/macros/utils/array_append.sql → ...clude/spark/macros/utils/array_append.sql
diff --git a/...clude/spark/macros/utils/array_concat.sql → ...clude/spark/macros/utils/array_concat.sql b/...clude/spark/macros/utils/array_concat.sql → ...clude/spark/macros/utils/array_concat.sql
diff --git a/...de/spark/macros/utils/array_construct.sql → ...de/spark/macros/utils/array_construct.sql b/...de/spark/macros/utils/array_construct.sql → ...de/spark/macros/utils/array_construct.sql
diff --git a/...de/spark/macros/utils/assert_not_null.sql → ...de/spark/macros/utils/assert_not_null.sql b/...de/spark/macros/utils/assert_not_null.sql → ...de/spark/macros/utils/assert_not_null.sql
diff --git a/dbt/include/spark/macros/utils/bool_or.sql → ...bt/include/spark/macros/utils/bool_or.sql b/dbt/include/spark/macros/utils/bool_or.sql → ...bt/include/spark/macros/utils/bool_or.sql
diff --git a/dbt/include/spark/macros/utils/concat.sql → ...dbt/include/spark/macros/utils/concat.sql b/dbt/include/spark/macros/utils/concat.sql → ...dbt/include/spark/macros/utils/concat.sql
diff --git a/dbt/include/spark/macros/utils/date.sql → ...c/dbt/include/spark/macros/utils/date.sql b/dbt/include/spark/macros/utils/date.sql → ...c/dbt/include/spark/macros/utils/date.sql
diff --git a/dbt/include/spark/macros/utils/dateadd.sql → ...bt/include/spark/macros/utils/dateadd.sql b/dbt/include/spark/macros/utils/dateadd.sql → ...bt/include/spark/macros/utils/dateadd.sql
diff --git a/dbt/include/spark/macros/utils/datediff.sql → ...t/include/spark/macros/utils/datediff.sql b/dbt/include/spark/macros/utils/datediff.sql → ...t/include/spark/macros/utils/datediff.sql
diff --git a/...ark/macros/utils/escape_single_quotes.sql → ...ark/macros/utils/escape_single_quotes.sql b/...ark/macros/utils/escape_single_quotes.sql → ...ark/macros/utils/escape_single_quotes.sql
diff --git a/dbt/include/spark/macros/utils/listagg.sql → ...bt/include/spark/macros/utils/listagg.sql b/dbt/include/spark/macros/utils/listagg.sql → ...bt/include/spark/macros/utils/listagg.sql
diff --git a/dbt/include/spark/macros/utils/safe_cast.sql → .../include/spark/macros/utils/safe_cast.sql b/dbt/include/spark/macros/utils/safe_cast.sql → .../include/spark/macros/utils/safe_cast.sql
diff --git a/...include/spark/macros/utils/split_part.sql → ...include/spark/macros/utils/split_part.sql b/...include/spark/macros/utils/split_part.sql → ...include/spark/macros/utils/split_part.sql
diff --git a/...include/spark/macros/utils/timestamps.sql → ...include/spark/macros/utils/timestamps.sql b/...include/spark/macros/utils/timestamps.sql → ...include/spark/macros/utils/timestamps.sql
diff --git a/dbt/include/spark/profile_template.yml → ...rc/dbt/include/spark/profile_template.yml b/dbt/include/spark/profile_template.yml → ...rc/dbt/include/spark/profile_template.yml
diff --git a/test.env.example → dbt-spark/test.env.example b/test.env.example → dbt-spark/test.env.example
diff --git a/tests/__init__.py → dbt-spark/tests/__init__.py b/tests/__init__.py → dbt-spark/tests/__init__.py
diff --git a/tests/conftest.py → dbt-spark/tests/conftest.py b/tests/conftest.py → dbt-spark/tests/conftest.py
diff --git a/.../functional/adapter/dbt_clone/fixtures.py → .../functional/adapter/dbt_clone/fixtures.py b/.../functional/adapter/dbt_clone/fixtures.py → .../functional/adapter/dbt_clone/fixtures.py
diff --git a/...ional/adapter/dbt_clone/test_dbt_clone.py → ...ional/adapter/dbt_clone/test_dbt_clone.py b/...ional/adapter/dbt_clone/test_dbt_clone.py → ...ional/adapter/dbt_clone/test_dbt_clone.py
diff --git a/...ctional/adapter/dbt_show/test_dbt_show.py → ...ctional/adapter/dbt_show/test_dbt_show.py b/...ctional/adapter/dbt_show/test_dbt_show.py → ...ctional/adapter/dbt_show/test_dbt_show.py
diff --git a/tests/functional/adapter/empty/test_empty.py → ...ts/functional/adapter/empty/test_empty.py b/tests/functional/adapter/empty/test_empty.py → ...ts/functional/adapter/empty/test_empty.py
diff --git a/...test_incremental_merge_exclude_columns.py → ...test_incremental_merge_exclude_columns.py b/...test_incremental_merge_exclude_columns.py → ...test_incremental_merge_exclude_columns.py
diff --git a/...ntal/test_incremental_on_schema_change.py → ...ntal/test_incremental_on_schema_change.py b/...ntal/test_incremental_on_schema_change.py → ...ntal/test_incremental_on_schema_change.py
diff --git a/...ncremental/test_incremental_predicates.py → ...ncremental/test_incremental_predicates.py b/...ncremental/test_incremental_predicates.py → ...ncremental/test_incremental_predicates.py
diff --git a/...incremental/test_incremental_unique_id.py → ...incremental/test_incremental_unique_id.py b/...incremental/test_incremental_unique_id.py → ...incremental/test_incremental_unique_id.py
diff --git a/...dapter/incremental_strategies/fixtures.py → ...dapter/incremental_strategies/fixtures.py b/...dapter/incremental_strategies/fixtures.py → ...dapter/incremental_strategies/fixtures.py
diff --git a/...l/adapter/incremental_strategies/seeds.py → ...l/adapter/incremental_strategies/seeds.py b/...l/adapter/incremental_strategies/seeds.py → ...l/adapter/incremental_strategies/seeds.py
diff --git a/...strategies/test_incremental_strategies.py → ...strategies/test_incremental_strategies.py b/...strategies/test_incremental_strategies.py → ...strategies/test_incremental_strategies.py
diff --git a/...incremental_strategies/test_microbatch.py → ...incremental_strategies/test_microbatch.py b/...incremental_strategies/test_microbatch.py → ...incremental_strategies/test_microbatch.py
diff --git a/...nctional/adapter/persist_docs/fixtures.py → ...nctional/adapter/persist_docs/fixtures.py b/...nctional/adapter/persist_docs/fixtures.py → ...nctional/adapter/persist_docs/fixtures.py
diff --git a/...adapter/persist_docs/test_persist_docs.py → ...adapter/persist_docs/test_persist_docs.py b/...adapter/persist_docs/test_persist_docs.py → ...adapter/persist_docs/test_persist_docs.py
diff --git a/...nal/adapter/seed_column_types/fixtures.py → ...nal/adapter/seed_column_types/fixtures.py b/...nal/adapter/seed_column_types/fixtures.py → ...nal/adapter/seed_column_types/fixtures.py
diff --git a/...ed_column_types/test_seed_column_types.py → ...ed_column_types/test_seed_column_types.py b/...ed_column_types/test_seed_column_types.py → ...ed_column_types/test_seed_column_types.py
diff --git a/tests/functional/adapter/test_basic.py → ...rk/tests/functional/adapter/test_basic.py b/tests/functional/adapter/test_basic.py → ...rk/tests/functional/adapter/test_basic.py
diff --git a/tests/functional/adapter/test_constraints.py → ...ts/functional/adapter/test_constraints.py b/tests/functional/adapter/test_constraints.py → ...ts/functional/adapter/test_constraints.py
diff --git a/...l/adapter/test_get_columns_in_relation.py → ...l/adapter/test_get_columns_in_relation.py b/...l/adapter/test_get_columns_in_relation.py → ...l/adapter/test_get_columns_in_relation.py
diff --git a/tests/functional/adapter/test_grants.py → ...k/tests/functional/adapter/test_grants.py b/tests/functional/adapter/test_grants.py → ...k/tests/functional/adapter/test_grants.py
diff --git a/...s/functional/adapter/test_python_model.py → ...s/functional/adapter/test_python_model.py b/...s/functional/adapter/test_python_model.py → ...s/functional/adapter/test_python_model.py
diff --git a/tests/functional/adapter/test_simple_seed.py → ...ts/functional/adapter/test_simple_seed.py b/tests/functional/adapter/test_simple_seed.py → ...ts/functional/adapter/test_simple_seed.py
diff --git a/...ional/adapter/test_store_test_failures.py → ...ional/adapter/test_store_test_failures.py b/...ional/adapter/test_store_test_failures.py → ...ional/adapter/test_store_test_failures.py
diff --git a/...adapter/unit_testing/test_unit_testing.py → ...adapter/unit_testing/test_unit_testing.py b/...adapter/unit_testing/test_unit_testing.py → ...adapter/unit_testing/test_unit_testing.py
diff --git a/...nctional/adapter/utils/fixture_listagg.py → ...nctional/adapter/utils/fixture_listagg.py b/...nctional/adapter/utils/fixture_listagg.py → ...nctional/adapter/utils/fixture_listagg.py
diff --git a/...nctional/adapter/utils/test_data_types.py → ...nctional/adapter/utils/test_data_types.py b/...nctional/adapter/utils/test_data_types.py → ...nctional/adapter/utils/test_data_types.py
diff --git a/...nctional/adapter/utils/test_timestamps.py → ...nctional/adapter/utils/test_timestamps.py b/...nctional/adapter/utils/test_timestamps.py → ...nctional/adapter/utils/test_timestamps.py
diff --git a/tests/functional/adapter/utils/test_utils.py → ...ts/functional/adapter/utils/test_utils.py b/tests/functional/adapter/utils/test_utils.py → ...ts/functional/adapter/utils/test_utils.py
diff --git a/tests/functional/conftest.py → dbt-spark/tests/functional/conftest.py b/tests/functional/conftest.py → dbt-spark/tests/functional/conftest.py
diff --git a/tests/unit/__init__.py → dbt-spark/tests/unit/__init__.py b/tests/unit/__init__.py → dbt-spark/tests/unit/__init__.py
diff --git a/tests/unit/conftest.py → dbt-spark/tests/unit/conftest.py b/tests/unit/conftest.py → dbt-spark/tests/unit/conftest.py
diff --git a/tests/unit/fixtures/__init__.py → dbt-spark/tests/unit/fixtures/__init__.py b/tests/unit/fixtures/__init__.py → dbt-spark/tests/unit/fixtures/__init__.py
diff --git a/tests/unit/fixtures/profiles.py → dbt-spark/tests/unit/fixtures/profiles.py b/tests/unit/fixtures/profiles.py → dbt-spark/tests/unit/fixtures/profiles.py
diff --git a/tests/unit/test_adapter.py → dbt-spark/tests/unit/test_adapter.py b/tests/unit/test_adapter.py → dbt-spark/tests/unit/test_adapter.py
diff --git a/tests/unit/test_column.py → dbt-spark/tests/unit/test_column.py b/tests/unit/test_column.py → dbt-spark/tests/unit/test_column.py
diff --git a/tests/unit/test_credentials.py → dbt-spark/tests/unit/test_credentials.py b/tests/unit/test_credentials.py → dbt-spark/tests/unit/test_credentials.py
diff --git a/tests/unit/test_macros.py → dbt-spark/tests/unit/test_macros.py b/tests/unit/test_macros.py → 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",
             ],

diff --git a/tests/unit/utils.py → dbt-spark/tests/unit/utils.py b/tests/unit/utils.py → dbt-spark/tests/unit/utils.py