Merge branch 'main' into paw/ct-2103-column-schema-2

Author: colin-rogers-dbt

.flake8

@@ -4,9 +4,11 @@ select =
     W
     F
 ignore =
-    W503 # makes Flake8 work like black
-    W504
-    E203 # makes Flake8 work like black
-    E741
-    E501
+    # makes Flake8 work like black
+    W503,
+    W504,
+    # makes Flake8 work like black
+    E203,
+    E741,
+    E501,
 exclude = test

.github/workflows/jira-creation.yml

@@ -19,7 +19,9 @@ permissions:
 
 jobs:
   call-label-action:
-    uses: dbt-labs/jira-actions/.github/workflows/jira-creation.yml@main
+    uses: dbt-labs/actions/.github/workflows/jira-creation.yml@main
+    with:
+      project_key: ADAP
     secrets:
       JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
       JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}

.github/workflows/jira-label.yml

@@ -19,7 +19,9 @@ permissions:
 
 jobs:
   call-label-action:
-    uses: dbt-labs/jira-actions/.github/workflows/jira-label.yml@main
+    uses: dbt-labs/actions/.github/workflows/jira-label.yml@main
+    with:
+      project_key: ADAP
     secrets:
       JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
       JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}

.github/workflows/jira-transition.yml

@@ -15,9 +15,14 @@ on:
   issues:
     types: [closed, deleted, reopened]
 
+# no special access is needed
+permissions: read-all
+
 jobs:
   call-label-action:
-    uses: dbt-labs/jira-actions/.github/workflows/jira-transition.yml@main
+    uses: dbt-labs/actions/.github/workflows/jira-transition.yml@main
+    with:
+      project_key: ADAP
     secrets:
       JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
       JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}

.pre-commit-config.yaml

@@ -5,11 +5,11 @@ exclude: '^tests/.*'
 
 # Force all unspecified python hooks to run python 3.8
 default_language_version:
-  python: python3.8
+  python: python3
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+  rev: v4.4.0
   hooks:
   - id: check-yaml
     args: [--unsafe]
@@ -18,31 +18,31 @@ repos:
   - id: trailing-whitespace
   - id: check-case-conflict
 - repo: https://github.com/psf/black
-  rev: 21.12b0
+  rev: 23.1.0
   hooks:
   - id: black
-    additional_dependencies: ['click==8.0.4']
+    additional_dependencies: ['click~=8.1']
     args:
     - "--line-length=99"
     - "--target-version=py38"
   - id: black
     alias: black-check
     stages: [manual]
-    additional_dependencies: ['click==8.0.4']
+    additional_dependencies: ['click~=8.1']
     args:
     - "--line-length=99"
     - "--target-version=py38"
     - "--check"
     - "--diff"
 - repo: https://github.com/pycqa/flake8
-  rev: 4.0.1
+  rev: 6.0.0
   hooks:
   - id: flake8
   - id: flake8
     alias: flake8-check
     stages: [manual]
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.942
+  rev: v1.0.1
   hooks:
   - id: mypy
     # N.B.: Mypy is... a bit fragile.
@@ -55,12 +55,12 @@ repos:
     # of our control to the mix.  Unfortunately, there's nothing we can
     # do about per pre-commit's author.
     # See https://github.com/pre-commit/pre-commit/issues/730 for details.
-    args: [--show-error-codes, --ignore-missing-imports]
+    args: [--show-error-codes, --ignore-missing-imports, --explicit-package-bases]
     files: ^dbt/adapters/.*
     language: system
   - id: mypy
     alias: mypy-check
     stages: [manual]
-    args: [--show-error-codes, --pretty, --ignore-missing-imports]
+    args: [--show-error-codes, --pretty, --ignore-missing-imports, --explicit-package-bases]
     files: ^dbt/adapters
     language: system

Makefile

@@ -5,6 +5,11 @@ dev: ## Installs adapter in develop mode along with development dependencies
 	@\
 	pip install -e . -r dev-requirements.txt && pre-commit install
 
+.PHONY: dev-uninstall
+dev-uninstall: ## Uninstalls all packages while maintaining the virtual environment
+               ## Useful when updating versions, or if you accidentally installed into the system interpreter
+	pip freeze | grep -v "^-e" | cut -d "@" -f1 | xargs pip uninstall -y
+
 .PHONY: mypy
 mypy: ## Runs mypy against staged changes for static type checking.
 	@\

dbt/adapters/redshift/connections.py

@@ -249,7 +249,6 @@ def execute(
         return response, table
 
     def add_query(self, sql, auto_begin=True, bindings=None, abridge_sql_log=False):
-
         connection = None
         cursor = None
 

dev-requirements.txt

@@ -4,22 +4,30 @@ git+https://github.com/dbt-labs/dbt-core.git@CT-1919/get_column_schema_from_quer
 git+https://github.com/dbt-labs/dbt-core.git@CT-1919/get_column_schema_from_query_macro2#egg=dbt-tests-adapter&subdirectory=tests/adapter
 git+https://github.com/dbt-labs/dbt-core.git@CT-1919/get_column_schema_from_query_macro2#egg=dbt-postgres&subdirectory=plugins/postgres
 
-black~=22.8.0
-click~=8.1.3
+# if version 1.x or greater -> pin to major version
+# if version 0.x -> pin to minor
+black~=23.1
 bumpversion~=0.6.0
-flake8
-flaky~=3.7.0
-freezegun~=0.3.12
-ipdb~=0.13.9
-mypy~=0.971.0
-pip-tools~=6.11.0
-pre-commit~=2.20.0
-pytest~=7.2.0
+click~=8.1
+flake8~=5.0;python_version=="3.7"
+flake8~=6.0;python_version>="3.8"
+flaky~=3.7
+freezegun~=1.2
+ipdb~=0.13.11
+mypy==1.0.1  # patch updates have historically introduced breaking changes
+pip-tools~=6.12
+pre-commit~=2.21;python_version=="3.7"
+pre-commit~=3.1;python_version>="3.8"
+pre-commit-hooks~=4.4
+pytest~=7.2
+pytest-csv~=3.0
 pytest-dotenv~=0.5.2
-pytest-logbook~=1.2.0
-pytest-csv~=3.0.0
-pytest-xdist~=3.1.0
-pytz~=2022.6.0
-tox~=4.0.0
-twine~=4.0.2
-wheel~=0.37.1
+pytest-logbook~=1.2
+pytest-xdist~=3.2
+pytz~=2022.7
+tox~=3.0;python_version=="3.7"
+tox~=4.4;python_version>="3.8"
+types-pytz~=2022.7
+types-requests~=2.28
+twine~=4.0
+wheel~=0.38