remove dbt_utils references

calogica · Nov 20, 2022 · 3330bc4 · 3330bc4
1 parent 8585d8b
commit 3330bc4
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -37,23 +37,7 @@ For latest release, see [https://github.com/calogica/dbt-expectations/releases](
 
 ### Dependencies
 
-This package includes a reference to [`dbt-date`](https://github.com/calogica/dbt-date) which in turn references [`dbt-utils`](https://github.com/dbt-labs/dbt-utils) so there's no need to also import either `dbt-date` or `dbt-utils` in your local project.
-
-Note: we no longer include `spark_utils` in this package to avoid versioning conflicts. If you are running this package on non-core platforms (outside of Snowflake, BigQuery, Redshift, Postgres), you will need to use a package like `spark_utils` to shim macros.
-
-For example, in `packages.yml`, you will need to include the relevant package:
-
-```yaml
-  - package: dbt-labs/spark_utils
-    version: <latest or range>
-```
-
-And reference in the dispatch list for `dbt_utils` in `dbt_project.yml`:
-
-```yaml
-vars:
-    dbt_utils_dispatch_list: [spark_utils]
-```
+This package includes a reference to [`dbt-date`](https://github.com/calogica/dbt-date), so there's no need to also import `dbt-date` in your local project.
 
 ### Variables
 
@@ -1137,7 +1121,7 @@ or, for example:
     test_end_date: '{{ modules.datetime.date.today() - modules.datetime.timedelta(1) }}'
 ```
 
-Unfortunately, you currently **cannot** use a dynamic SQL date, such as `current_date` or macro from a dbt package such as dbt-date, as the underlying `dbt_utils.date_spine` expects a date literal.
+Unfortunately, you currently **cannot** use a dynamic SQL date, such as `current_date` or macro from a dbt package such as dbt-date, as the underlying `date_spine` macro expects a date literal.
 
 The `interval` argument will optionally group `date_part` by a given integer to test data presence at a lower granularity, e.g. adding `interval: 7` to the example above will test whether a model has data for each 7-`day` period instead of for each `day`.
 

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -12,7 +12,3 @@ target-path: "target"
 clean-targets: ["target", "dbt_packages"]
 macro-paths: ["macros"]
 log-path: "logs"
-
-dispatch:
-  - macro_namespace: dbt_utils
-    search_order: ['dbt_expectations', 'dbt_utils']  # enable override
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -18,11 +18,9 @@ clean-targets: ["target", "dbt_modules", "dbt_packages"]
 dispatch:
   - macro_namespace: dbt_expectations
     search_order: ['dbt_expectations_integration_tests', 'dbt_expectations']
-  - macro_namespace: dbt_utils
-    search_order: ['dbt_expectations', 'dbt_utils']
+
 vars:
     'dbt_date:time_zone': 'America/Los_Angeles'
-
 quoting:
     database: false
     identifier: false

diff --git a/integration_tests/models/schema_tests/data_test_factored.sql b/integration_tests/models/schema_tests/data_test_factored.sql
@@ -1 +1 @@
-{{ dbt_utils.generate_series(upper_bound=8) }}
+{{ dbt_date.generate_series(upper_bound=8) }}
diff --git a/integration_tests/models/schema_tests/series_10.sql b/integration_tests/models/schema_tests/series_10.sql
@@ -1 +1 @@
-{{ dbt_utils.generate_series(upper_bound=10) }}
+{{ dbt_date.generate_series(upper_bound=10) }}
diff --git a/integration_tests/models/schema_tests/series_4.sql b/integration_tests/models/schema_tests/series_4.sql
@@ -1 +1 @@
-{{ dbt_utils.generate_series(upper_bound=4) }}
+{{ dbt_date.generate_series(upper_bound=4) }}
diff --git a/integration_tests/models/schema_tests/timeseries_hourly.sql b/integration_tests/models/schema_tests/timeseries_hourly.sql
@@ -1,4 +1,4 @@
-{{ dbt_utils.date_spine('hour',
+{{ dbt_date.date_spine('hour',
         start_date=dbt_date.n_days_ago(10),
         end_date=dbt_date.tomorrow()
     )

diff --git a/macros/schema_tests/distributional/expect_column_values_to_be_within_n_moving_stdevs.sql b/macros/schema_tests/distributional/expect_column_values_to_be_within_n_moving_stdevs.sql
@@ -69,7 +69,7 @@ with metric_values as (
             sum({{ column_name }}) as agg_metric_value
         from
             {{ model }}
-        {{  dbt_utils.group_by(1 + group_by_length) }}
+        {{  dbt_expectations.group_by(1 + group_by_length) }}
 
     )
     {%- if take_diffs %}

diff --git a/macros/schema_tests/distributional/expect_column_values_to_be_within_n_stdevs.sql b/macros/schema_tests/distributional/expect_column_values_to_be_within_n_stdevs.sql
@@ -24,7 +24,7 @@ with metric_values as (
     from
         {{ model }}
     {% if group_by -%}
-    {{  dbt_utils.group_by(group_by | length) }}
+    {{  dbt_expectations.group_by(group_by | length) }}
     {%- endif %}
 
 ),

diff --git a/macros/schema_tests/table_shape/expect_grouped_row_values_to_have_recent_data.sql b/macros/schema_tests/table_shape/expect_grouped_row_values_to_have_recent_data.sql
@@ -36,7 +36,7 @@ with latest_grouped_timestamps as (
         {% endif %}
 
     {% if group_by -%}
-    {{  dbt_utils.group_by(group_by | length) }}
+    {{  dbt_expectations.group_by(group_by | length) }}
     {%- endif %}
 ),
 total_row_counts as (
@@ -48,7 +48,7 @@ total_row_counts as (
     from
         latest_grouped_timestamps
     {% if group_by -%}
-    {{  dbt_utils.group_by(group_by | length) }}
+    {{  dbt_expectations.group_by(group_by | length) }}
     {%- endif %}
 
 

diff --git a/packages.yml b/packages.yml
@@ -1,3 +1,5 @@
 packages:
-  - package: calogica/dbt_date
-    version: [">=0.6.0", "<0.7.0"]
+  # - package: calogica/dbt_date
+  #   version: [">=0.7.0", "<0.8.0"]
+  - git: "https://github.com/calogica/dbt-date.git"
+    revision: 0.7.0