Skip to content

Commit

Permalink
Merge branch 'main' into fd-add-base-class
Browse files Browse the repository at this point in the history
  • Loading branch information
Fokko authored Aug 10, 2023
2 parents c6033ec + 6000540 commit d46ff07
Show file tree
Hide file tree
Showing 59 changed files with 492 additions and 288 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions .changes/0.0.0.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 0 additions & 1 deletion .changes/1.6.0-a1.md

This file was deleted.

31 changes: 0 additions & 31 deletions .changes/1.6.0-b1.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/1.6.0-b2.md

This file was deleted.

13 changes: 0 additions & 13 deletions .changes/1.6.0-b3.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Dependencies-20230329-102021.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Dependencies-20230406-230203.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Dependencies-20230421-041623.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Dependencies-20230421-180054.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Dependencies-20230421-230051.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Dependencies-20230423-215745.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/1.6.0/Dependency-20221116-221906.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/1.6.0/Features-20220812-091652.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Features-20230427-123135.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Features-20230604-043421.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Fixes-20230420-214433.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Fixes-20230510-154735.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Fixes-20230512-151453.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Under the Hood-20230508-222118.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/1.6.0/Under the Hood-20230530-162533.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230424-230630.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update tox requirement from ~=3.0 to ~=4.5"
time: 2023-04-24T23:06:30.00000Z
custom:
Author: dependabot[bot]
PR: 741
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230424-230645.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update pyodbc requirement from ~=4.0.30 to ~=4.0.39"
time: 2023-04-24T23:06:45.00000Z
custom:
Author: dependabot[bot]
PR: 742
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230501-231003.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update pre-commit requirement from ~=2.21 to ~=3.3"
time: 2023-05-01T23:10:03.00000Z
custom:
Author: dependabot[bot]
PR: 748
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230501-231035.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update types-requests requirement from ~=2.28 to ~=2.29"
time: 2023-05-01T23:10:35.00000Z
custom:
Author: dependabot[bot]
PR: 749
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230510-230725.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Bump mypy from 1.2.0 to 1.3.0"
time: 2023-05-10T23:07:25.00000Z
custom:
Author: dependabot[bot]
PR: 768
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230803-224622.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update flake8 requirement from ~=6.0 to ~=6.1"
time: 2023-08-03T22:46:22.00000Z
custom:
Author: dependabot[bot]
PR: 849
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230803-224626.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update pytest-xdist requirement from ~=3.2 to ~=3.3"
time: 2023-08-03T22:46:26.00000Z
custom:
Author: dependabot[bot]
PR: 851
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230803-224629.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update pytest requirement from ~=7.3 to ~=7.4"
time: 2023-08-03T22:46:29.00000Z
custom:
Author: dependabot[bot]
PR: 852
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230804-225232.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update pip-tools requirement from ~=6.13 to ~=7.2"
time: 2023-08-04T22:52:32.00000Z
custom:
Author: dependabot[bot]
PR: 856
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230804-225243.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update wheel requirement from ~=0.40 to ~=0.41"
time: 2023-08-04T22:52:43.00000Z
custom:
Author: dependabot[bot]
PR: 858
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20230807-221037.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update tox requirement from ~=4.5 to ~=4.6"
time: 2023-08-07T22:10:37.00000Z
custom:
Author: dependabot[bot]
PR: 861
6 changes: 6 additions & 0 deletions .changes/unreleased/Features-20230707-104150.yaml
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 6 additions & 0 deletions .changes/unreleased/Features-20230707-113337.yaml
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 6 additions & 0 deletions .changes/unreleased/Features-20230707-114650.yaml
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 0 additions & 6 deletions .changes/unreleased/Fixes-20230510-163110.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/unreleased/Fixes-20230623-112100.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/unreleased/Fixes-20230628-162413.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20230810-014122.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Fixes
body: include tblproperties macro in adapters.sql create table
time: 2023-08-10T01:41:22.782982+08:00
custom:
Author: etheleon
Issue: "865"
6 changes: 6 additions & 0 deletions .changes/unreleased/Under the Hood-20230724-165508.yaml
Original file line number Diff line number Diff line change
@@ -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"
41 changes: 21 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -115,9 +116,9 @@ workflows:
test-everything:
jobs:
- unit
- integration-spark-session:
requires:
- unit
# - integration-spark-session:
# requires:
# - unit
- integration-spark-thrift:
requires:
- unit
Expand Down
Loading

0 comments on commit d46ff07

Please sign in to comment.