Merge pull request #12 from fivetran/MagicBot_99708e692c

[MagicBot] Bumping package version
fivetran · Dec 20, 2021 · 1325e9f · 1325e9f
2 parents f304901 + f4abb29
commit 1325e9f
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 target/
 dbt_modules/
 logs/
-.DS_Store
+.DS_Store
+dbt_packages/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # dbt_klaviyo_source v0.4.0
-## Breaking Changes
+🎉 dbt v1.0.0 Compatibility 🎉
+## 🚨 Breaking Changes 🚨
+- Adjusts the `require-dbt-version` to now be within the range [">=1.0.0", "<2.0.0"]. Additionally, the package has been updated for dbt v1.0.0 compatibility. If you are using a dbt version <1.0.0, you will need to upgrade in order to leverage the latest version of the package.
+  - For help upgrading your package, I recommend reviewing this GitHub repo's Release Notes on what changes have been implemented since your last upgrade.
+  - For help upgrading your dbt project to dbt v1.0.0, I recommend reviewing dbt-labs [upgrading to 1.0.0 docs](https://docs.getdbt.com/docs/guides/migration-guide/upgrading-to-1-0-0) for more details on what changes must be made.
+- Upgrades the package dependency to refer to the latest `dbt_fivetran_utils`. The latest `dbt_fivetran_utils` package also has a dependency on `dbt_utils` [">=0.8.0", "<0.9.0"].
+  - Please note, if you are installing a version of `dbt_utils` in your `packages.yml` that is not in the range above then you will encounter a package dependency error.
 - The `union_schemas` and `union_databases` variables have been replaced with `klaviyo_union_schemas` and `klaviyo_union_databases` respectively. This allows for multiple packages with the union ability to be used and not locked to a single variable that is used across packages.
 ## Under the Hood
 - Added a surrogate key within `stg_klaviyo__event` to capture unique combination of `event_id` and `source_relation` columns. This will be used in downstream incremental models configurations.
@@ -20,4 +26,4 @@
 - [@pawelngei](https://github.com/pawelngei) [#8](https://github.com/fivetran/dbt_klaviyo_source/pull/8)
 
 # dbt_klaviyo_source v0.1.0 -> v0.3.0
-Refer to the relevant release notes on the Github repository for specific details for the previous releases. Thank you!
+Refer to the relevant release notes on the Github repository for specific details for the previous releases. Thank you!
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Apache License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![dbt logo and version](https://img.shields.io/static/v1?logo=dbt&label=dbt-version&message=0.20.x&color=orange)
+[![Apache License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 # Klaviyo (Source)
 
 This package models Klaviyo data from [Fivetran's connector](https://fivetran.com/docs/applications/klaviyo). It uses data in the format described by [this ERD](https://fivetran.com/docs/applications/klaviyo#schemainformation).

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,24 +1,22 @@
 name: 'klaviyo_source'
 version: '0.4.0'
 config-version: 2
-require-dbt-version: ">=0.20.0"
+require-dbt-version: [">=1.0.0", "<2.0.0"]
 
 
 vars:
   klaviyo_source:
-    event_table: "{{ source('klaviyo', 'event') }}" 
-    campaign: "{{ source('klaviyo', 'campaign') }}" 
-    flow: "{{ source('klaviyo', 'flow') }}" 
-    integration: "{{ source('klaviyo', 'integration') }}" 
-    person: "{{ source('klaviyo', 'person') }}" 
-    metric: "{{ source('klaviyo', 'metric') }}" 
+    event_table: "{{ source('klaviyo', 'event') }}"
+    campaign: "{{ source('klaviyo', 'campaign') }}"
+    flow: "{{ source('klaviyo', 'flow') }}"
+    integration: "{{ source('klaviyo', 'integration') }}"
+    person: "{{ source('klaviyo', 'person') }}"
+    metric: "{{ source('klaviyo', 'metric') }}"
     klaviyo__event_pass_through_columns: []
     klaviyo__person_pass_through_columns: []
-
   dbt_utils_dispatch_list: [spark_utils, fivetran_utils]
   fivetran_utils_dispatch_list: [spark_utils]
-
-models: 
+models:
   klaviyo_source:
     tmp:
       +materialized: view

diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt
@@ -1,3 +1,6 @@
-dbt==0.20.1rc1
-dbt-spark==0.20.1rc1
-dbt-spark[PyHive]==0.20.1rc1
+dbt-snowflake==1.0.0
+dbt-bigquery==1.0.0
+dbt-redshift==1.0.0
+dbt-postgres==1.0.0
+dbt-spark==1.0.0
+dbt-spark[PyHive]==1.0.0
diff --git a/integration_tests/data/campaign.csv → integration_tests/seeds/campaign.csv b/integration_tests/data/campaign.csv → integration_tests/seeds/campaign.csv
diff --git a/integration_tests/data/event.csv → integration_tests/seeds/event.csv b/integration_tests/data/event.csv → integration_tests/seeds/event.csv
diff --git a/integration_tests/data/flow.csv → integration_tests/seeds/flow.csv b/integration_tests/data/flow.csv → integration_tests/seeds/flow.csv
diff --git a/integration_tests/data/flow_snowflake.csv → integration_tests/seeds/flow_snowflake.csv b/integration_tests/data/flow_snowflake.csv → integration_tests/seeds/flow_snowflake.csv
diff --git a/integration_tests/data/integration.csv → integration_tests/seeds/integration.csv b/integration_tests/data/integration.csv → integration_tests/seeds/integration.csv
diff --git a/integration_tests/data/metric.csv → integration_tests/seeds/metric.csv b/integration_tests/data/metric.csv → integration_tests/seeds/metric.csv
diff --git a/integration_tests/data/person.csv → integration_tests/seeds/person.csv b/integration_tests/data/person.csv → integration_tests/seeds/person.csv
diff --git a/packages.yml b/packages.yml
@@ -1,6 +1,5 @@
 packages:
-  - package: fivetran/fivetran_utils
-    version: [">=0.2.0", "<0.3.0"]
-
-  - package: dbt-labs/spark_utils
-    version: [">=0.2.0", "<0.3.0"]
+- package: fivetran/fivetran_utils
+  version: [">=0.3.0", "<0.4.0"]
+- package: dbt-labs/spark_utils
+  version: [">=0.2.0", "<0.3.0"]