From d94ca0a14605c7f95aa959620ea8ae181bbc06b8 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 24 Jan 2024 10:05:10 -0800 Subject: [PATCH 1/4] rename artifacts import --- dbt/tests/__init__.py | 6 ++++++ dbt/tests/adapter/basic/test_incremental.py | 2 +- dbt/tests/adapter/catalog/relation_types.py | 2 +- dbt/tests/adapter/incremental/test_incremental_unique_id.py | 2 +- dbt/tests/adapter/store_test_failures_tests/basic.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 dbt/tests/__init__.py diff --git a/dbt/tests/__init__.py b/dbt/tests/__init__.py new file mode 100644 index 00000000..782ff40f --- /dev/null +++ b/dbt/tests/__init__.py @@ -0,0 +1,6 @@ +# N.B. +# This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters) + +from pkgutil import extend_path + +__path__ = extend_path(__path__, __name__) diff --git a/dbt/tests/adapter/basic/test_incremental.py b/dbt/tests/adapter/basic/test_incremental.py index 5312d057..fe04a5a1 100644 --- a/dbt/tests/adapter/basic/test_incremental.py +++ b/dbt/tests/adapter/basic/test_incremental.py @@ -1,7 +1,7 @@ import pytest # TODO: update to new dbt-artifacts once available -from dbt.artifacts.results import RunStatus +from dbt.artifacts.schemas.results import RunStatus from dbt.tests.adapter.basic import files from dbt.tests.util import run_dbt, check_relations_equal, relation_from_name diff --git a/dbt/tests/adapter/catalog/relation_types.py b/dbt/tests/adapter/catalog/relation_types.py index acf41876..791f1768 100644 --- a/dbt/tests/adapter/catalog/relation_types.py +++ b/dbt/tests/adapter/catalog/relation_types.py @@ -1,5 +1,5 @@ # TODO: repoint to dbt-artifacts when it is available -from dbt.artifacts.catalog import CatalogArtifact +from dbt.artifacts.schemas.catalog import CatalogArtifact import pytest from dbt.tests.adapter.catalog import files diff --git a/dbt/tests/adapter/incremental/test_incremental_unique_id.py b/dbt/tests/adapter/incremental/test_incremental_unique_id.py index 5eab47bf..bddf407e 100644 --- a/dbt/tests/adapter/incremental/test_incremental_unique_id.py +++ b/dbt/tests/adapter/incremental/test_incremental_unique_id.py @@ -2,7 +2,7 @@ from pathlib import Path # TODO: repoint to dbt-artifacts when it's available -from dbt.artifacts.results import RunStatus +from dbt.artifacts.schemas.results import RunStatus import pytest from dbt.tests.util import check_relations_equal, run_dbt diff --git a/dbt/tests/adapter/store_test_failures_tests/basic.py b/dbt/tests/adapter/store_test_failures_tests/basic.py index dd4a4670..be8e942d 100644 --- a/dbt/tests/adapter/store_test_failures_tests/basic.py +++ b/dbt/tests/adapter/store_test_failures_tests/basic.py @@ -2,7 +2,7 @@ from typing import Set # TODO: repoint to dbt-artifacts when it's available -from dbt.artifacts.results import TestStatus +from dbt.artifacts.schemas.results import TestStatus import pytest from dbt.tests.adapter.store_test_failures_tests import _files From 13cf25be784c25e3e79880a267034807eb520ed5 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 24 Jan 2024 10:59:29 -0800 Subject: [PATCH 2/4] remove __init__.py from tests --- dbt/__init__.py | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 dbt/__init__.py diff --git a/dbt/__init__.py b/dbt/__init__.py deleted file mode 100644 index 782ff40f..00000000 --- a/dbt/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# N.B. -# This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters) - -from pkgutil import extend_path - -__path__ = extend_path(__path__, __name__) From da9fdd1d2c0438645ac7c776f2f542fc99f17a0a Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 24 Jan 2024 11:05:21 -0800 Subject: [PATCH 3/4] fix __init__.py --- dbt/tests/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dbt/tests/__init__.py b/dbt/tests/__init__.py index 782ff40f..8b137891 100644 --- a/dbt/tests/__init__.py +++ b/dbt/tests/__init__.py @@ -1,6 +1 @@ -# N.B. -# This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters) -from pkgutil import extend_path - -__path__ = extend_path(__path__, __name__) From 15b1c0cfbf9da6e9876c0ac791daa4983209dbdd Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 24 Jan 2024 11:06:12 -0800 Subject: [PATCH 4/4] fix __init__.py --- dbt/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dbt/__init__.py diff --git a/dbt/__init__.py b/dbt/__init__.py new file mode 100644 index 00000000..782ff40f --- /dev/null +++ b/dbt/__init__.py @@ -0,0 +1,6 @@ +# N.B. +# This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters) + +from pkgutil import extend_path + +__path__ = extend_path(__path__, __name__)