Merge branch 'main' into depends-on-vars

.changes/unreleased/Features-20240926-151057.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Adds validations for custom_granularities to ensure unique naming.
+time: 2024-09-26T15:10:57.907694-07:00
+custom:
+  Author: courtneyholcomb
+  Issue: "9265"

core/dbt/parser/schemas.py

@@ -412,17 +412,11 @@ def get_key_dicts(self) -> Iterable[Dict[str, Any]]:
 
             if self.schema_yaml_vars.env_vars:
                 self.schema_parser.manifest.env_vars.update(self.schema_yaml_vars.env_vars)
-                schema_file = self.yaml.file
-                assert isinstance(schema_file, SchemaSourceFile)
                 for env_var in self.schema_yaml_vars.env_vars.keys():
                     schema_file.add_env_var(env_var, self.key, entry["name"])
-                for var in self.schema_yaml_vars.env_vars.keys():
-                    schema_file.add_env_var(var, self.key, entry["name"])
                 self.schema_yaml_vars.env_vars = {}
 
             if self.schema_yaml_vars.vars:
-                schema_file = self.yaml.file
-                assert isinstance(schema_file, SchemaSourceFile)
                 schema_file.add_vars(self.schema_yaml_vars.vars, self.key, entry["name"])
                 self.schema_yaml_vars.vars = {}
 

core/setup.py

@@ -69,7 +69,7 @@
         # These are major-version-0 packages also maintained by dbt-labs.
         # Accept patches but avoid automatically updating past a set minor version range.
         "dbt-extractor>=0.5.0,<=0.6",
-        "dbt-semantic-interfaces>=0.7.1,<0.8",
+        "dbt-semantic-interfaces>=0.7.2,<0.8",
         # Minor versions for these are expected to be backwards-compatible
         "dbt-common>=1.9.0,<2.0",
         "dbt-adapters>=1.7.0,<2.0",

tests/unit/contracts/graph/test_nodes.py

@@ -1,3 +1,4 @@
+from argparse import Namespace
 import pickle
 import re
 from dataclasses import replace
@@ -24,6 +25,12 @@
 )
 
 
+@pytest.fixture
+def args_for_flags() -> Namespace:
+    return Namespace(
+        state_modified_compare_vars=False
+    )
+
 def norm_whitespace(string):
     _RE_COMBINE_WHITESPACE = re.compile(r"\s+")
     string = _RE_COMBINE_WHITESPACE.sub(" ", string).strip()

tests/unit/contracts/graph/test_nodes_parsed.py

@@ -65,8 +65,10 @@
 
 
 @pytest.fixture
-def flags_for_args() -> Namespace:
-    return Namespace(SEND_ANONYMOUS_USAGE_STATS=False)
+def args_for_flags() -> Namespace:
+    return Namespace(
+        send_anonymous_usage_stats=False, state_modified_compare_vars=False
+    )
 
 
 @pytest.fixture

tests/unit/graph/test_selector_methods.py

@@ -1,3 +1,4 @@
+from argparse import Namespace
 import copy
 from dataclasses import replace
 from pathlib import Path
@@ -643,6 +644,11 @@ def previous_state(manifest):
     return create_previous_state(manifest)
 
 
+@pytest.fixture
+def args_for_flags():
+    return Namespace(state_modified_compare_vars=False)
+
+
 def add_node(manifest, node):
     manifest.nodes[node.unique_id] = node