Merge pull request #54 from fivetran/MagicBot_4331b66d62

[MagicBot] Bumping package version
fivetran · Dec 20, 2021 · e6c984d · e6c984d
2 parents 7211fb6 + 2f3eb48
commit e6c984d
Show file tree

Hide file tree

Showing 57 changed files with 71 additions and 57 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,6 +16,7 @@ jobs:
       - run:
           name: "Setup dbt"
           command: |
+            sudo apt install libsasl2-dev
             python3 -m venv venv
             . venv/bin/activate
             pip install --upgrade pip setuptools

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,4 +1,11 @@
-# dbt_hubspot_source (next release)
+# dbt_hubspot_source v0.5.0
+🎉 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.
 
 # dbt_hubspot_source v0.1.0 -> v0.4.3
-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) 
 # Hubspot (Source)
 
 This package models Hubspot data from [Fivetran's connector](https://fivetran.com/docs/applications/hubspot). It uses data in the format described by the [marketing](https://fivetran.com/docs/applications/hubspot#schemainformation), [sales](https://fivetran.com/docs/applications/hubspot#crmandsaleshubschema) and [service](https://fivetran.com/docs/applications/hubspot#servicehubschema) ERDs.
@@ -27,7 +27,7 @@ Include in `packages.yml`
 ```yaml
 packages:
   - package: fivetran/hubspot_source
-    version: [">=0.4.0", "<0.5.0"]
+    version: [">=0.5.0", "<0.6.0"]
 ```
 
 ## Configuration

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,7 +1,7 @@
 name: 'hubspot_source'
-version: '0.4.3'
+version: '0.5.0'
 config-version: 2
-require-dbt-version: ">=0.20.0"
+require-dbt-version: [">=1.0.0", "<2.0.0"]
 
 models:
   hubspot_source:
@@ -12,58 +12,58 @@ models:
 
 vars:
   hubspot_source:
-    company:                    "{{ source('hubspot','company') }}" 
-    company_property_history:   "{{ source('hubspot','company_property_history') }}" 
-    contact:                    "{{ source('hubspot','contact') }}" 
-    contact_merge_audit:        "{{ source('hubspot','contact_merge_audit') }}"
-    contact_list:               "{{ source('hubspot','contact_list') }}" 
-    contact_list_member:        "{{ source('hubspot','contact_list_member') }}" 
-    contact_property_history:   "{{ source('hubspot','contact_property_history') }}" 
-    deal:                       "{{ source('hubspot','deal') }}" 
-    deal_stage:                 "{{ source('hubspot','deal_stage') }}" 
-    deal_company:               "{{ source('hubspot','deal_company') }}" 
-    deal_pipeline:              "{{ source('hubspot','deal_pipeline') }}" 
-    deal_pipeline_stage:        "{{ source('hubspot','deal_pipeline_stage') }}" 
-    deal_property_history:      "{{ source('hubspot','deal_property_history') }}" 
-    email_campaign:             "{{ source('hubspot','email_campaign') }}" 
-    email_event:                "{{ source('hubspot','email_event') }}" 
-    email_event_bounce:         "{{ source('hubspot','email_event_bounce') }}" 
-    email_event_click:          "{{ source('hubspot','email_event_click') }}" 
-    email_event_deferred:       "{{ source('hubspot','email_event_deferred') }}" 
-    email_event_delivered:      "{{ source('hubspot','email_event_delivered') }}" 
-    email_event_dropped:        "{{ source('hubspot','email_event_dropped') }}" 
-    email_event_forward:        "{{ source('hubspot','email_event_forward') }}" 
-    email_event_open:           "{{ source('hubspot','email_event_open') }}" 
-    email_event_print:          "{{ source('hubspot','email_event_print') }}" 
-    email_event_sent:           "{{ source('hubspot','email_event_sent') }}" 
-    email_event_spam_report:    "{{ source('hubspot','email_event_spam_report') }}" 
-    email_event_status_change:  "{{ source('hubspot','email_event_status_change') }}" 
-    engagement:                 "{{ source('hubspot','engagement') }}" 
-    engagement_call:            "{{ source('hubspot','engagement_call') }}" 
-    engagement_company:         "{{ source('hubspot','engagement_company') }}" 
-    engagement_contact:         "{{ source('hubspot','engagement_contact') }}" 
-    engagement_deal:            "{{ source('hubspot','engagement_deal') }}" 
-    engagement_email:           "{{ source('hubspot','engagement_email') }}" 
-    engagement_meeting:         "{{ source('hubspot','engagement_meeting') }}" 
-    engagement_note:            "{{ source('hubspot','engagement_note') }}" 
-    engagement_task:            "{{ source('hubspot','engagement_task') }}" 
-    owner:                      "{{ source('hubspot','owner') }}" 
+    company: "{{ source('hubspot','company') }}"
+    company_property_history: "{{ source('hubspot','company_property_history') }}"
+    contact: "{{ source('hubspot','contact') }}"
+    contact_merge_audit: "{{ source('hubspot','contact_merge_audit') }}"
+    contact_list: "{{ source('hubspot','contact_list') }}"
+    contact_list_member: "{{ source('hubspot','contact_list_member') }}"
+    contact_property_history: "{{ source('hubspot','contact_property_history') }}"
+    deal: "{{ source('hubspot','deal') }}"
+    deal_stage: "{{ source('hubspot','deal_stage') }}"
+    deal_company: "{{ source('hubspot','deal_company') }}"
+    deal_pipeline: "{{ source('hubspot','deal_pipeline') }}"
+    deal_pipeline_stage: "{{ source('hubspot','deal_pipeline_stage') }}"
+    deal_property_history: "{{ source('hubspot','deal_property_history') }}"
+    email_campaign: "{{ source('hubspot','email_campaign') }}"
+    email_event: "{{ source('hubspot','email_event') }}"
+    email_event_bounce: "{{ source('hubspot','email_event_bounce') }}"
+    email_event_click: "{{ source('hubspot','email_event_click') }}"
+    email_event_deferred: "{{ source('hubspot','email_event_deferred') }}"
+    email_event_delivered: "{{ source('hubspot','email_event_delivered') }}"
+    email_event_dropped: "{{ source('hubspot','email_event_dropped') }}"
+    email_event_forward: "{{ source('hubspot','email_event_forward') }}"
+    email_event_open: "{{ source('hubspot','email_event_open') }}"
+    email_event_print: "{{ source('hubspot','email_event_print') }}"
+    email_event_sent: "{{ source('hubspot','email_event_sent') }}"
+    email_event_spam_report: "{{ source('hubspot','email_event_spam_report') }}"
+    email_event_status_change: "{{ source('hubspot','email_event_status_change') }}"
+    engagement: "{{ source('hubspot','engagement') }}"
+    engagement_call: "{{ source('hubspot','engagement_call') }}"
+    engagement_company: "{{ source('hubspot','engagement_company') }}"
+    engagement_contact: "{{ source('hubspot','engagement_contact') }}"
+    engagement_deal: "{{ source('hubspot','engagement_deal') }}"
+    engagement_email: "{{ source('hubspot','engagement_email') }}"
+    engagement_meeting: "{{ source('hubspot','engagement_meeting') }}"
+    engagement_note: "{{ source('hubspot','engagement_note') }}"
+    engagement_task: "{{ source('hubspot','engagement_task') }}"
+    owner: "{{ source('hubspot','owner') }}"
 
     #Service Hub Models
-    ticket_company:             "{{ source('hubspot','ticket_company') }}"
-    ticket_contact:             "{{ source('hubspot','ticket_contact') }}"
-    ticket_deal:                "{{ source('hubspot','ticket_deal') }}"
-    ticket_engagement:          "{{ source('hubspot','ticket_engagement') }}"
-    ticket_pipeline:            "{{ source('hubspot','ticket_pipeline') }}"
-    ticket_pipeline_stage:      "{{ source('hubspot','ticket_pipeline_stage') }}"
-    ticket_property_history:    "{{ source('hubspot','ticket_property_history') }}"
-    ticket:                     "{{ source('hubspot','ticket') }}"
+    ticket_company: "{{ source('hubspot','ticket_company') }}"
+    ticket_contact: "{{ source('hubspot','ticket_contact') }}"
+    ticket_deal: "{{ source('hubspot','ticket_deal') }}"
+    ticket_engagement: "{{ source('hubspot','ticket_engagement') }}"
+    ticket_pipeline: "{{ source('hubspot','ticket_pipeline') }}"
+    ticket_pipeline_stage: "{{ source('hubspot','ticket_pipeline_stage') }}"
+    ticket_property_history: "{{ source('hubspot','ticket_property_history') }}"
+    ticket: "{{ source('hubspot','ticket') }}"
 
     #Service Hub Enable Variables
-    hubspot_service_enabled:              false
+    hubspot_service_enabled: false
 
     #Contact Merge Audit Enable Variable
-    hubspot_contact_merge_audit_enabled:  false
+    hubspot_contact_merge_audit_enabled: false
 
     #HubSpot Passthrough Columns
     hubspot__deal_pass_through_columns: []
@@ -72,4 +72,4 @@ vars:
     hubspot__ticket_pass_through_columns: []
 
     #OVERRIDE any ^ passthrough columns by just passing all columns
-    hubspot__pass_through_all_columns: false
+    hubspot__pass_through_all_columns: false
diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt
@@ -1 +1,6 @@
-dbt~=0.20.0
+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/.gitkeep → integration_tests/seeds/.gitkeep b/integration_tests/data/.gitkeep → integration_tests/seeds/.gitkeep
diff --git a/integration_tests/data/company_data.csv → integration_tests/seeds/company_data.csv b/integration_tests/data/company_data.csv → integration_tests/seeds/company_data.csv
diff --git a/...ts/data/company_property_history_data.csv → ...s/seeds/company_property_history_data.csv b/...ts/data/company_property_history_data.csv → ...s/seeds/company_property_history_data.csv
diff --git a/integration_tests/data/contact_data.csv → integration_tests/seeds/contact_data.csv b/integration_tests/data/contact_data.csv → integration_tests/seeds/contact_data.csv
diff --git a/integration_tests/data/contact_list_data.csv → ...gration_tests/seeds/contact_list_data.csv b/integration_tests/data/contact_list_data.csv → ...gration_tests/seeds/contact_list_data.csv
diff --git a/...tests/data/contact_list_data_postgres.csv → ...ests/seeds/contact_list_data_postgres.csv b/...tests/data/contact_list_data_postgres.csv → ...ests/seeds/contact_list_data_postgres.csv
diff --git a/...n_tests/data/contact_list_member_data.csv → ..._tests/seeds/contact_list_member_data.csv b/...n_tests/data/contact_list_member_data.csv → ..._tests/seeds/contact_list_member_data.csv
diff --git a/...n_tests/data/contact_merge_audit_data.csv → ..._tests/seeds/contact_merge_audit_data.csv b/...n_tests/data/contact_merge_audit_data.csv → ..._tests/seeds/contact_merge_audit_data.csv
diff --git a/...ts/data/contact_property_history_data.csv → ...s/seeds/contact_property_history_data.csv b/...ts/data/contact_property_history_data.csv → ...s/seeds/contact_property_history_data.csv
diff --git a/integration_tests/data/deal_company_data.csv → ...gration_tests/seeds/deal_company_data.csv b/integration_tests/data/deal_company_data.csv → ...gration_tests/seeds/deal_company_data.csv
diff --git a/integration_tests/data/deal_data.csv → integration_tests/seeds/deal_data.csv b/integration_tests/data/deal_data.csv → integration_tests/seeds/deal_data.csv
diff --git a/...gration_tests/data/deal_pipeline_data.csv → ...ration_tests/seeds/deal_pipeline_data.csv b/...gration_tests/data/deal_pipeline_data.csv → ...ration_tests/seeds/deal_pipeline_data.csv
diff --git a/...n_tests/data/deal_pipeline_stage_data.csv → ..._tests/seeds/deal_pipeline_stage_data.csv b/...n_tests/data/deal_pipeline_stage_data.csv → ..._tests/seeds/deal_pipeline_stage_data.csv
diff --git a/...tests/data/deal_property_history_data.csv → ...ests/seeds/deal_property_history_data.csv b/...tests/data/deal_property_history_data.csv → ...ests/seeds/deal_property_history_data.csv
diff --git a/integration_tests/data/deal_stage_data.csv → integration_tests/seeds/deal_stage_data.csv b/integration_tests/data/deal_stage_data.csv → integration_tests/seeds/deal_stage_data.csv
diff --git a/...ration_tests/data/email_campaign_data.csv → ...ation_tests/seeds/email_campaign_data.csv b/...ration_tests/data/email_campaign_data.csv → ...ation_tests/seeds/email_campaign_data.csv
diff --git a/...on_tests/data/email_event_bounce_data.csv → ...n_tests/seeds/email_event_bounce_data.csv b/...on_tests/data/email_event_bounce_data.csv → ...n_tests/seeds/email_event_bounce_data.csv
diff --git a/...ion_tests/data/email_event_click_data.csv → ...on_tests/seeds/email_event_click_data.csv b/...ion_tests/data/email_event_click_data.csv → ...on_tests/seeds/email_event_click_data.csv
diff --git a/integration_tests/data/email_event_data.csv → integration_tests/seeds/email_event_data.csv b/integration_tests/data/email_event_data.csv → integration_tests/seeds/email_event_data.csv
diff --git a/..._tests/data/email_event_deferred_data.csv → ...tests/seeds/email_event_deferred_data.csv b/..._tests/data/email_event_deferred_data.csv → ...tests/seeds/email_event_deferred_data.csv
diff --git a/...tests/data/email_event_delivered_data.csv → ...ests/seeds/email_event_delivered_data.csv b/...tests/data/email_event_delivered_data.csv → ...ests/seeds/email_event_delivered_data.csv
diff --git a/...n_tests/data/email_event_dropped_data.csv → ..._tests/seeds/email_event_dropped_data.csv b/...n_tests/data/email_event_dropped_data.csv → ..._tests/seeds/email_event_dropped_data.csv
diff --git a/...ata/email_event_dropped_data_postgres.csv → ...eds/email_event_dropped_data_postgres.csv b/...ata/email_event_dropped_data_postgres.csv → ...eds/email_event_dropped_data_postgres.csv
diff --git a/...ta/email_event_dropped_data_snowflake.csv → ...ds/email_event_dropped_data_snowflake.csv b/...ta/email_event_dropped_data_snowflake.csv → ...ds/email_event_dropped_data_snowflake.csv
diff --git a/...n_tests/data/email_event_forward_data.csv → ..._tests/seeds/email_event_forward_data.csv b/...n_tests/data/email_event_forward_data.csv → ..._tests/seeds/email_event_forward_data.csv
diff --git a/...tion_tests/data/email_event_open_data.csv → ...ion_tests/seeds/email_event_open_data.csv b/...tion_tests/data/email_event_open_data.csv → ...ion_tests/seeds/email_event_open_data.csv
diff --git a/...ion_tests/data/email_event_print_data.csv → ...on_tests/seeds/email_event_print_data.csv b/...ion_tests/data/email_event_print_data.csv → ...on_tests/seeds/email_event_print_data.csv
diff --git a/...tion_tests/data/email_event_sent_data.csv → ...ion_tests/seeds/email_event_sent_data.csv b/...tion_tests/data/email_event_sent_data.csv → ...ion_tests/seeds/email_event_sent_data.csv
diff --git a/...s/data/email_event_sent_data_postgres.csv → .../seeds/email_event_sent_data_postgres.csv b/...s/data/email_event_sent_data_postgres.csv → .../seeds/email_event_sent_data_postgres.csv
diff --git a/.../data/email_event_sent_data_snowflake.csv → ...seeds/email_event_sent_data_snowflake.csv b/.../data/email_event_sent_data_snowflake.csv → ...seeds/email_event_sent_data_snowflake.csv
diff --git a/...sts/data/email_event_spam_report_data.csv → ...ts/seeds/email_event_spam_report_data.csv b/...sts/data/email_event_spam_report_data.csv → ...ts/seeds/email_event_spam_report_data.csv
diff --git a/...s/data/email_event_status_change_data.csv → .../seeds/email_event_status_change_data.csv b/...s/data/email_event_status_change_data.csv → .../seeds/email_event_status_change_data.csv
diff --git a/...ation_tests/data/engagement_call_data.csv → ...tion_tests/seeds/engagement_call_data.csv b/...ation_tests/data/engagement_call_data.csv → ...tion_tests/seeds/engagement_call_data.csv
diff --git a/...on_tests/data/engagement_company_data.csv → ...n_tests/seeds/engagement_company_data.csv b/...on_tests/data/engagement_company_data.csv → ...n_tests/seeds/engagement_company_data.csv
diff --git a/...on_tests/data/engagement_contact_data.csv → ...n_tests/seeds/engagement_contact_data.csv b/...on_tests/data/engagement_contact_data.csv → ...n_tests/seeds/engagement_contact_data.csv
diff --git a/integration_tests/data/engagement_data.csv → integration_tests/seeds/engagement_data.csv b/integration_tests/data/engagement_data.csv → integration_tests/seeds/engagement_data.csv
diff --git a/...ation_tests/data/engagement_deal_data.csv → ...tion_tests/seeds/engagement_deal_data.csv b/...ation_tests/data/engagement_deal_data.csv → ...tion_tests/seeds/engagement_deal_data.csv
diff --git a/...tion_tests/data/engagement_email_data.csv → ...ion_tests/seeds/engagement_email_data.csv b/...tion_tests/data/engagement_email_data.csv → ...ion_tests/seeds/engagement_email_data.csv
diff --git a/...on_tests/data/engagement_meeting_data.csv → ...n_tests/seeds/engagement_meeting_data.csv b/...on_tests/data/engagement_meeting_data.csv → ...n_tests/seeds/engagement_meeting_data.csv
diff --git a/...ation_tests/data/engagement_note_data.csv → ...tion_tests/seeds/engagement_note_data.csv b/...ation_tests/data/engagement_note_data.csv → ...tion_tests/seeds/engagement_note_data.csv
diff --git a/...ation_tests/data/engagement_task_data.csv → ...tion_tests/seeds/engagement_task_data.csv b/...ation_tests/data/engagement_task_data.csv → ...tion_tests/seeds/engagement_task_data.csv
diff --git a/integration_tests/data/owner_data.csv → integration_tests/seeds/owner_data.csv b/integration_tests/data/owner_data.csv → integration_tests/seeds/owner_data.csv
diff --git a/...ration_tests/data/ticket_company_data.csv → ...ation_tests/seeds/ticket_company_data.csv b/...ration_tests/data/ticket_company_data.csv → ...ation_tests/seeds/ticket_company_data.csv
diff --git a/...ration_tests/data/ticket_contact_data.csv → ...ation_tests/seeds/ticket_contact_data.csv b/...ration_tests/data/ticket_contact_data.csv → ...ation_tests/seeds/ticket_contact_data.csv
diff --git a/integration_tests/data/ticket_data.csv → integration_tests/seeds/ticket_data.csv b/integration_tests/data/ticket_data.csv → integration_tests/seeds/ticket_data.csv
diff --git a/integration_tests/data/ticket_deal_data.csv → integration_tests/seeds/ticket_deal_data.csv b/integration_tests/data/ticket_deal_data.csv → integration_tests/seeds/ticket_deal_data.csv
diff --git a/...ion_tests/data/ticket_engagement_data.csv → ...on_tests/seeds/ticket_engagement_data.csv b/...ion_tests/data/ticket_engagement_data.csv → ...on_tests/seeds/ticket_engagement_data.csv
diff --git a/...ation_tests/data/ticket_pipeline_data.csv → ...tion_tests/seeds/ticket_pipeline_data.csv b/...ation_tests/data/ticket_pipeline_data.csv → ...tion_tests/seeds/ticket_pipeline_data.csv
diff --git a/...tests/data/ticket_pipeline_stage_data.csv → ...ests/seeds/ticket_pipeline_stage_data.csv b/...tests/data/ticket_pipeline_stage_data.csv → ...ests/seeds/ticket_pipeline_stage_data.csv
diff --git a/...sts/data/ticket_property_history_data.csv → ...ts/seeds/ticket_property_history_data.csv b/...sts/data/ticket_property_history_data.csv → ...ts/seeds/ticket_property_history_data.csv
diff --git a/packages.yml b/packages.yml
@@ -1,3 +1,3 @@
 packages:
-  - package: fivetran/fivetran_utils
-    version: [">=0.2.0", "<0.3.0"]
+- package: fivetran/fivetran_utils
+  version: [">=0.3.0", "<0.4.0"]