From fac01d8c7519d6f2da2441962922cc4e2df8cdb3 Mon Sep 17 00:00:00 2001 From: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> Date: Wed, 16 Jul 2025 14:12:34 -0500 Subject: [PATCH 1/3] Q2 FY26: Apply automated update. --- .../maintainer_pull_request_template.md | 9 ++- .github/workflows/auto-release.yml | 13 ++-- .github/workflows/generate-docs.yml | 13 ++++ .gitignore | 74 ++++++++++++++++++- CHANGELOG.md | 19 +++++ LICENSE | 2 +- README.md | 17 +++-- integration_tests/dbt_project.yml | 4 + 8 files changed, 131 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/generate-docs.yml diff --git a/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md index 99c450c..0899dc6 100644 --- a/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md @@ -12,13 +12,15 @@ Before marking this PR as "ready for review": ## PR Overview **Package version introduced in this PR:** - +- + **This PR addresses the following Issue/Feature(s):** +- **Summary of changes:** - +- ### Submission Checklist - [ ] Alignment meeting with the reviewer (if needed) @@ -27,9 +29,10 @@ Before marking this PR as "ready for review": - [ ] **Validation Steps:** Check for unintentional effects (e.g., add/run consistency & integrity tests) - [ ] **Testing Instructions:** Confirm the change addresses the issue(s) - [ ] **Focus Areas:** Complex logic or queries that need extra attention +- [ ] Merge any relevant open PRs into this PR ### Changelog - [ ] Draft changelog for PR -- [ ] Final changelog for release review \ No newline at end of file +- [ ] Final changelog for release review diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 8ed5853..76d6944 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -3,11 +3,12 @@ on: pull_request: types: - closed - branches: - - main + - labeled jobs: - call-workflow-passing-data: - if: github.event.pull_request.merged - uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main - secrets: inherit \ No newline at end of file + release: + if: | + (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main') || + github.event.label.name == 'pre-release' + uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@feature/pre-release-support + secrets: inherit diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml new file mode 100644 index 0000000..43f3394 --- /dev/null +++ b/.github/workflows/generate-docs.yml @@ -0,0 +1,13 @@ +name: 'generate dbt docs' +on: + pull_request: + types: + - labeled + +jobs: + generate-docs: + if: github.event.label.name == 'docs:ready' + uses: fivetran/dbt_package_automations/.github/workflows/generate-docs.yml@main + secrets: inherit + with: + schema_var_name: apple_store_schema \ No newline at end of file diff --git a/.gitignore b/.gitignore index ba69d74..06f4e77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,73 @@ - -target/ +# dbt +**/package-lock.yml +package-lock.yml +.dbt/ +dbt_modules/ dbt_packages/ logs/ -env/ \ No newline at end of file +profiles.yml +target/ +*.log + +# IDE files +.idea/ +.vscode/ +*~ +*.swp +*.swo + +# Jupyter Notebook +.ipynb_checkpoints + +# OS generated files +**/.DS_Store +.DS_Store +.Spotlight-V100 +.Trashes +._* +Thumbs.db +ehthumbs.db + +# Python +*.egg +*.egg-info/ +*.py[cod] +*.so +*$py.class +.Python +__pycache__/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.env +.installed.cfg +lib/ +lib64/ +MANIFEST +parts/ +sdist/ +var/ +wheels/ + +# Secrets and credentials +.env.* +.secrets +credentials.json +service-account.json + +# Temporary files +.cache/ +*.temp +*.tmp + +# Virtual environments +.conda/ +.env +.venv +ENV/ +env/ +env.bak/ +venv/ +venv.bak/ diff --git a/CHANGELOG.md b/CHANGELOG.md index c8f97fe..3b405f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +[PR #22](https://github.com/fivetran/dbt_apple_store_source/pull/22) includes the following updates: + +### Under the Hood - July 2025 Updates + +- Updated conditions in `.github/workflows/auto-release.yml`. +- Added `.github/workflows/generate-docs.yml`. +- Added `+docs: show: False` to `integration_tests/dbt_project.yml`. +- Migrated `flags` (e.g., `send_anonymous_usage_stats`, `use_colors`) from `sample.profiles.yml` to `integration_tests/dbt_project.yml`. +- Updated `maintainer_pull_request_template.md` with improved checklist. +- Refreshed README tag block: + - Standardized Quickstart-compatible badge set + - Left-aligned and positioned below the H1 title. +- Updated Python image version to `3.10.13` in `pipeline.yml`. +- Added `CI_DATABRICKS_DBT_CATALOG` to: + - `.buildkite/hooks/pre-command` (as an export) + - `pipeline.yml` (under the `environment` block, after `CI_DATABRICKS_DBT_TOKEN`) +- Added `certifi==2025.1.31` to `requirements.txt` (if missing). +- Updated `.gitignore` to exclude additional DBT, Python, and system artifacts. + # dbt_apple_store_source v0.6.0 [PR #21](https://github.com/fivetran/dbt_apple_store_source/pull/21) includes the following updates: diff --git a/LICENSE b/LICENSE index 261eeb9..f9554a9 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright © 2025 Fivetran Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 5fa5522..3249d85 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,14 @@ href="https://github.com/fivetran/dbt_apple_store_source/blob/main/LICENSE"> - + + +

## What does this dbt package do? @@ -92,25 +95,25 @@ models: apple_store_source: +schema: my_new_schema_name # leave blank for just the target_schema ``` - + #### Change the source table references If an individual source table has a different name than the package expects, add the table name as it appears in your destination to the respective variable: > IMPORTANT: See this project's [`dbt_project.yml`](https://github.com/fivetran/dbt_apple_store_source/blob/main/dbt_project.yml) variable declarations to see the expected names. - + ```yml vars: apple_store__identifier: your_table_name ``` - + ### (Optional) Step 7: Orchestrate your models with Fivetran Transformations for dbt Core™
Expand to view details
- + Fivetran offers the ability for you to orchestrate your dbt project through [Fivetran Transformations for dbt Core™](https://fivetran.com/docs/transformations/dbt). Learn how to set up your project for orchestration through Fivetran in our [Transformations for dbt Core™ setup guides](https://fivetran.com/docs/transformations/dbt#setupguide).
- + ## Does this package have dependencies? This dbt package is dependent on the following dbt packages. These dependencies are installed by default within this package. For more information on the following packages, refer to the [dbt hub](https://hub.getdbt.com/) site. > IMPORTANT: If you have any of these dependent packages in your own `packages.yml` file, we highly recommend that you remove them from your root `packages.yml` to avoid package version conflicts. @@ -122,7 +125,7 @@ packages: - package: dbt-labs/dbt_utils version: [">=1.0.0", "<2.0.0"] ``` - + ## How is this package maintained and can I contribute? ### Package Maintenance The Fivetran team maintaining this package _only_ maintains the latest version of the package. We highly recommend that you stay consistent with the [latest version](https://hub.getdbt.com/fivetran/apple_store_source/latest/) of the package and refer to the [CHANGELOG](https://github.com/fivetran/dbt_apple_store_source/blob/main/CHANGELOG.md) and release notes for more information on changes across versions. diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index cc89e14..80d4cfe 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -24,6 +24,8 @@ models: columns: "{{ false if target.type in ('spark','databricks') else true }}" seeds: + +docs: + show: False apple_store_source_integration_tests: +quote_columns: "{{ true if target.type == 'redshift' else false }}" +column_types: @@ -36,3 +38,5 @@ dispatch: flags: send_anonymous_usage_stats: False + + use_colors: True \ No newline at end of file From 1700a3fea1981f9a5ac25ec84cc202a7306f518c Mon Sep 17 00:00:00 2001 From: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> Date: Wed, 16 Jul 2025 14:31:00 -0500 Subject: [PATCH 2/3] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 3249d85..cd90433 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,6 @@ - -

## What does this dbt package do? From a40b1edb11aa1733e16c77f68a8982067ac856cb Mon Sep 17 00:00:00 2001 From: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> Date: Tue, 22 Jul 2025 10:56:06 -0500 Subject: [PATCH 3/3] Q2 FY26: Update auto-release workflow only. --- .github/workflows/auto-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 76d6944..e0a7100 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -10,5 +10,5 @@ jobs: if: | (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main') || github.event.label.name == 'pre-release' - uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@feature/pre-release-support + uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main secrets: inherit