Merge branch 'main' into mcknight/fix-test-store-test

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.0b3
+current_version = 1.7.0a1
 parse = (?P<major>[\d]+) # major version number
 	\.(?P<minor>[\d]+) # minor version number
 	\.(?P<patch>[\d]+) # patch version number

.changes/0.0.0.md

@@ -1,5 +1,6 @@
 ## Previous Releases
 For information on prior major and minor releases, see their changelogs:
+- [1.6](https://github.com/dbt-labs/dbt-spark/blob/1.6.latest/CHANGELOG.md)
 - [1.5](https://github.com/dbt-labs/dbt-spark/blob/1.5.latest/CHANGELOG.md)
 - [1.4](https://github.com/dbt-labs/dbt-spark/blob/1.4.latest/CHANGELOG.md)
 - [1.3](https://github.com/dbt-labs/dbt-spark/blob/1.3.latest/CHANGELOG.md)

.changes/unreleased/Features-20230707-104150.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Support server_side_parameters for Spark session connection method
+time: 2023-07-07T10:41:50.01541+02:00
+custom:
+  Author: alarocca-apixio
+  Issue: "690"

.changes/unreleased/Features-20230707-113337.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Add server_side_parameters to HTTP connection method
+time: 2023-07-07T11:33:37.794112+02:00
+custom:
+  Author: Fokko,JCZuurmond
+  Issue: "824"

.changes/unreleased/Features-20230707-114650.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Enforce server side parameters keys and values to be strings
+time: 2023-07-07T11:46:50.390918+02:00
+custom:
+  Author: Fokko,JCZuurmond
+  Issue: "826"

.changes/unreleased/Under the Hood-20230724-165508.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Update stale workflow to use centralized version
+time: 2023-07-24T16:55:08.096947-04:00
+custom:
+  Author: mikealfare
+  Issue: "842"

.circleci/config.yml

@@ -10,23 +10,24 @@ jobs:
       - checkout
       - run: tox -e flake8,unit
 
-  integration-spark-session:
-    environment:
-      DBT_INVOCATION_ENV: circle
-    docker:
-      - image: godatadriven/pyspark:3.1
-    steps:
-      - checkout
-      - run: apt-get update
-      - run: python3 -m pip install --upgrade pip
-      - run: apt-get install -y git gcc g++ unixodbc-dev libsasl2-dev
-      - run: python3 -m pip install tox
-      - run:
-          name: Run integration tests
-          command: tox -e integration-spark-session
-          no_output_timeout: 1h
-      - store_artifacts:
-          path: ./logs
+# Turning off for now due to flaky runs of tests will turn back on at later date.
+  # integration-spark-session:
+  #   environment:
+  #     DBT_INVOCATION_ENV: circle
+  #   docker:
+  #     - image: godatadriven/pyspark:3.1
+  #   steps:
+  #     - checkout
+  #     - run: apt-get update
+  #     - run: python3 -m pip install --upgrade pip
+  #     - run: apt-get install -y git gcc g++ unixodbc-dev libsasl2-dev
+  #     - run: python3 -m pip install tox
+  #     - run:
+  #         name: Run integration tests
+  #         command: tox -e integration-spark-session
+  #         no_output_timeout: 1h
+  #     - store_artifacts:
+  #         path: ./logs
 
   integration-spark-thrift:
     environment:
@@ -115,9 +116,9 @@ workflows:
   test-everything:
     jobs:
       - unit
-      - integration-spark-session:
-          requires:
-            - unit
+      # - integration-spark-session:
+      #     requires:
+      #       - unit
       - integration-spark-thrift:
           requires:
             - unit

.github/workflows/bot-changelog.yml

@@ -57,4 +57,4 @@ jobs:
         commit_message: "Add automated changelog yaml from template for bot PR"
         changie_kind: ${{ matrix.changie_kind }}
         label: ${{ matrix.label }}
-        custom_changelog_string: "custom:\n  Author: ${{ github.event.pull_request.user.login }}\n  PR: ${{ github.event.pull_request.number }}"
+        custom_changelog_string: "custom:\n  Author: ${{ github.event.pull_request.user.login }}\n  PR: ${{ github.event.pull_request.number }}\n"

.github/workflows/stale.yml

@@ -1,15 +1,12 @@
-name: 'Close stale issues and PRs'
+name: "Close stale issues and PRs"
 on:
   schedule:
     - cron: "30 1 * * *"
+
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   stale:
-    runs-on: ubuntu-latest
-    steps:
-      # pinned at v4 (https://github.com/actions/stale/releases/tag/v4.0.0)
-      - uses: actions/stale@cdf15f641adb27a71842045a94023bef6945e3aa
-        with:
-          stale-issue-message: "This issue has been marked as Stale because it has been open for 180 days with no activity. If you would like the issue to remain open, please remove the stale label or comment on the issue, or it will be closed in 7 days."
-          stale-pr-message: "This PR has been marked as Stale because it has been open for 180 days with no activity. If you would like the PR to remain open, please remove the stale label or comment on the PR, or it will be closed in 7 days."
-          # mark issues/PRs stale when they haven't seen activity in 180 days
-          days-before-stale: 180
+    uses: dbt-labs/actions/.github/workflows/stale-bot-matrix.yml@main

CHANGELOG.md

@@ -5,64 +5,9 @@
 - "Breaking changes" listed under a version may require action from end users or external maintainers when upgrading to that version.
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie). For details on how to document a change, see [the contributing guide](https://github.com/dbt-labs/dbt-spark/blob/main/CONTRIBUTING.md#adding-changelog-entry)
 
-## dbt-spark 1.6.0-b3 - June 09, 2023
-
-### Features
-
-- Standardize the _connection_keys and debug_query for `dbt debug`. ([#PR754](https://github.com/dbt-labs/dbt-spark/issues/PR754))
-
-### Fixes
-
-- wrap expression for check constraints in parentheses ([#7480](https://github.com/dbt-labs/dbt-spark/issues/7480))
-
-### Under the Hood
-
-- drop support for python 3.7 ([#792](https://github.com/dbt-labs/dbt-spark/issues/792))
-
-
-
-## dbt-spark 1.6.0-b2 - May 25, 2023
-
-### Features
-
-- All constraint types are supported, but not enforced. ([#656](https://github.com/dbt-labs/dbt-spark/issues/656), [#657](https://github.com/dbt-labs/dbt-spark/issues/657))
-
-## dbt-spark 1.6.0-b1 - May 12, 2023
-
-### Features
-
-- Support insert_overwrite strategy with delta ([#1013](https://github.com/dbt-labs/dbt-spark/issues/1013))
-
-### Fixes
-
-- Fixed issue where table materialization was not always properly refreshing for non-admin users on Databricks ([#725](https://github.com/dbt-labs/dbt-spark/issues/725))
-- Remove dead code 💀 ([#758](https://github.com/dbt-labs/dbt-spark/issues/758))
-
-### Under the Hood
-
-- Remove unneeded type ignore ([#753](https://github.com/dbt-labs/dbt-spark/issues/753))
-
-### Dependencies
-
-- Update black requirement from ~=23.1 to ~=23.3 ([#701](https://github.com/dbt-labs/dbt-spark/pull/701))
-- Bump mypy from 1.1.1 to 1.2.0 ([#708](https://github.com/dbt-labs/dbt-spark/pull/708))
-- Update pytest requirement from ~=7.2 to ~=7.3 ([#726](https://github.com/dbt-labs/dbt-spark/pull/726))
-- Update types-pytz requirement from ~=2023.2 to ~=2023.3 ([#704](https://github.com/dbt-labs/dbt-spark/pull/704))
-- Update pip-tools requirement from ~=6.12 to ~=6.13 ([#737](https://github.com/dbt-labs/dbt-spark/pull/737))
-- Update pytz requirement from ~=2023.2 to ~=2023.3 ([#702](https://github.com/dbt-labs/dbt-spark/pull/702))
-
-### Dependency
-
-- Bump pyodbc from 4.0.34 to 4.0.35 ([#417](https://github.com/dbt-labs/dbt-spark/issues/417))
-
-### Contributors
-- [@Fokko](https://github.com/Fokko) ([#758](https://github.com/dbt-labs/dbt-spark/issues/758), [#753](https://github.com/dbt-labs/dbt-spark/issues/753))
-- [@flvndh](https://github.com/flvndh) ([#1013](https://github.com/dbt-labs/dbt-spark/issues/1013))
-
-## dbt-spark 1.6.0-a1 - April 17, 2023
-
 ## Previous Releases
 For information on prior major and minor releases, see their changelogs:
+- [1.6](https://github.com/dbt-labs/dbt-spark/blob/1.6.latest/CHANGELOG.md)
 - [1.5](https://github.com/dbt-labs/dbt-spark/blob/1.5.latest/CHANGELOG.md)
 - [1.4](https://github.com/dbt-labs/dbt-spark/blob/1.4.latest/CHANGELOG.md)
 - [1.3](https://github.com/dbt-labs/dbt-spark/blob/1.3.latest/CHANGELOG.md)

dbt/adapters/spark/__version__.py

@@ -1 +1 @@
-version = "1.6.0b3"
+version = "1.7.0a1"