Merge pull request #60 from fivetran/update_source_version_and_deps

update deps
fivetran · Oct 4, 2023 · 6213613 · 6213613
2 parents ac96513 + f501a68
commit 6213613
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,16 @@
 # dbt_google_ads v0.10.0
-[PR #52](https://github.com/fivetran/dbt_google_ads/pull/52) includes the following updates:
-## Feature update 🎉
-- Unioning capability! This adds the ability to union source data from multiple google_ads connectors. Refer to the [README](https://github.com/fivetran/dbt_google_ads/blob/main/README.md) for more details.
-
-## Under the hood 🚘
-- In the source package, updated tmp models to union source data using the `fivetran_utils.union_data` macro. 
-- To distinguish which source each field comes from, added `source_relation` column in each staging and downstream model and applied the `fivetran_utils.source_relation` macro.
-- Updated tests to account for the new `source_relation` column.
-    - The `source_relation` column is included in all joins in the transform package. 
+## Dependency Updates
+- Removes the dependency on `dbt-expectations`. Upstream we specifically removed the `dbt_expectations.expect_column_values_to_not_match_regex_list` test. ([PR #60](https://github.com/fivetran/dbt_google_ads/pull/60)) 
 
-[PR #58](https://github.com/fivetran/dbt_google_ads/pull/58) includes the following updates:
-## Under the Hood:
-- Updates the [DECISIONLOG](DECISIONLOG.md) to clarify why there exist differences among aggregations across different grains.
+## Feature Update 🎉
+- Unioning capability! This adds the ability to union source data from multiple google_ads connectors. Refer to the [README](https://github.com/fivetran/dbt_google_ads/blob/main/README.md) for more details. ([PR #52](https://github.com/fivetran/dbt_google_ads/pull/52))
+
+## Under the Hood 🚘
+- In the source package, updated tmp models to union source data using the `fivetran_utils.union_data` macro. ([PR #52](https://github.com/fivetran/dbt_google_ads/pull/52))
+- To distinguish which source each field comes from, added `source_relation` column in each staging and downstream model and applied the `fivetran_utils.source_relation` macro. ([PR #52](https://github.com/fivetran/dbt_google_ads/pull/52))
+- Updated tests to account for the new `source_relation` column. ([PR #52](https://github.com/fivetran/dbt_google_ads/pull/52))
+    - The `source_relation` column is included in all joins in the transform package. 
+- Updates the [DECISIONLOG](DECISIONLOG.md) to clarify why there exist differences among aggregations across different grains. ([PR #58](https://github.com/fivetran/dbt_google_ads/pull/58))
 
 # dbt_google_ads v0.9.3
 [PR #57](https://github.com/fivetran/dbt_google_ads/pull/57) includes the following updates:

diff --git a/README.md b/README.md
@@ -39,14 +39,11 @@ To use this dbt package, you must have the following:
 - A **BigQuery**, **Snowflake**, **Redshift**, **PostgreSQL**, or **Databricks** destination.
 
 ### Databricks Dispatch Configuration
-If you are using a Databricks destination with this package you will need to add the below (or a variation of the below) dispatch configuration within your `dbt_project.yml`. This is required in order for the package to accurately search for macros within the `dbt-labs/spark_utils` then the `dbt-labs/dbt_utils` as well as the `calogica/dbt_expectations` then the `google_ads_source` packages respectively.
+If you are using a Databricks destination with this package you will need to add the below (or a variation of the below) dispatch configuration within your `dbt_project.yml`. This is required in order for the package to accurately search for macros within the `dbt-labs/spark_utils` then the `dbt-labs/dbt_utils`.
 ```yml
 dispatch:
   - macro_namespace: dbt_utils
     search_order: ['spark_utils', 'dbt_utils']
-
-  - macro_namespace: dbt_expectations
-    search_order: ['google_ads_source', 'dbt_expectations']
 ```
 
 ## Step 2: Install the package
@@ -159,12 +156,6 @@ packages:
 
     - package: dbt-labs/spark_utils
       version: [">=0.3.0", "<0.4.0"]
-
-    - package: calogica/dbt_expectations
-      version: [">=0.8.0", "<0.9.0"]
-
-    - package: calogica/dbt_date
-      version: [">=0.7.0", "<0.8.0"]
 ```
 # 🙌 How is this package maintained and can I contribute?
 ## Package Maintenance

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -33,6 +33,3 @@ seeds:
 dispatch:
   - macro_namespace: dbt_utils
     search_order: ['spark_utils', 'dbt_utils']
-
-  - macro_namespace: dbt_expectations
-    search_order: ['google_ads_source', 'dbt_expectations']
diff --git a/packages.yml b/packages.yml
@@ -1,7 +1,3 @@
 packages:
-# - package: fivetran/google_ads_source
-#   version: [">=0.10.0", "<0.11.0"]
-
-  - git: https://github.com/fivetran/dbt_google_ads_source.git
-    revision: MagicBot/add-union-schema
-    warn-unpinned: false
+- package: fivetran/google_ads_source
+  version: [">=0.10.0", "<0.11.0"]