Merge branch 'main' into config/release

dbt-labs · Jan 18, 2024 · 3dd6d75 · 3dd6d75
2 parents e3cd5b2 + e4c2f95
commit 3dd6d75
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -153,8 +153,4 @@ dmypy.json
 cython_debug/
 
 # PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
diff --git a/dbt/__init__.py 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__)
diff --git a/dbt/adapters/py.typed b/dbt/adapters/py.typed
diff --git a/dbt/include/__init__.py b/dbt/include/__init__.py
@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)