Merge branch 'main' of https://github.com/dbt-labs/dbt-postgres into …

…mcknight/2819

.changes/unreleased/Features-20240731-210800.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Add support for Python 3.12
+time: 2024-07-31T21:08:00.170999-04:00
+custom:
+  Author: mikealfare
+  Issue: "17"

.github/scripts/update_dev_packages.sh → .github/scripts/update_dev_dependency_branches.sh

@@ -2,16 +2,20 @@
 set -e
 
 
-adapters_git_branch=$1
-core_git_branch=$2
+dbt_adapters_branch=$1
+dbt_core_branch=$2
+dbt_common_branch=$3
 target_req_file="pyproject.toml"
-core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${core_git_branch}#subdirectory=core|g"
-adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${adapters_git_branch}|g"
+core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${dbt_core_branch}#subdirectory=core|g"
+adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${dbt_adapters_branch}|g"
+common_req_sed_pattern="s|dbt-common.git|dbt-common.git@${dbt_common_branch}|g"
 if [[ "$OSTYPE" == darwin* ]]; then
  # mac ships with a different version of sed that requires a delimiter arg
- sed -i "" "$core_req_sed_pattern" $target_req_file
  sed -i "" "$adapters_req_sed_pattern" $target_req_file
+ sed -i "" "$core_req_sed_pattern" $target_req_file
+ sed -i "" "$common_req_sed_pattern" $target_req_file
 else
- sed -i "$core_req_sed_pattern" $target_req_file
  sed -i "$adapters_req_sed_pattern" $target_req_file
+ sed -i "$core_req_sed_pattern" $target_req_file
+ sed -i "$common_req_sed_pattern" $target_req_file
 fi

.github/workflows/integration-tests.yml

@@ -1,5 +1,7 @@
 name: Integration Tests
 
+run-name: "${{ (contains(github.event_name, 'workflow_') && inputs.name) || github.event_name }}: ${{ (contains(github.event_name, 'workflow_') &&  inputs.adapter_branch) || github.ref_name }} by @${{ github.actor }}"
+
 on:
   push:
     branches:
@@ -8,28 +10,58 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
+      name:
+        description: "Name to associate with run (example: 'dbt-adapters-242')"
+        required: false
+        type: string
+        default: "Adapter Integration Tests"
+      adapter_branch:
+        description: "The branch of this adapter repository to use"
+        type: string
+        required: false
+        default: "main"
       dbt_adapters_branch:
         description: "The branch of dbt-adapters to use"
         type: string
         required: false
         default: "main"
-      core_branch:
+      dbt_core_branch:
         description: "The branch of dbt-core to use"
         type: string
         required: false
         default: "main"
+      dbt_common_branch:
+        description: "The branch of dbt-common to use"
+        type: string
+        required: false
+        default: "main"
   workflow_call:
     inputs:
+      name:
+        description: "name to associate with run"
+        required: false
+        type: string
+        default: "Adapter Integration Tests"
+      adapter_branch:
+        description: "The branch of this adapter repository to use"
+        type: string
+        required: false
+        default: "main"
       dbt_adapters_branch:
         description: "The branch of dbt-adapters to use"
         type: string
         required: false
         default: "main"
-      core_branch:
+      dbt_core_branch:
         description: "The branch of dbt-core to use"
         type: string
         required: false
         default: "main"
+      dbt_common_branch:
+        description: "The branch of dbt-common to use"
+        type: string
+        required: false
+        default: "main"
 
 permissions: read-all
 
@@ -50,7 +82,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     services:
       postgres:
@@ -67,14 +99,23 @@ jobs:
 
     steps:
       - name: Check out repository
+        if: ${{ github.event_name == 'pull_request'|| github.event_name == 'push' }}
         uses: actions/checkout@v4
 
+      - name: Check out the repository (workflow_dispatch)
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.adapter_branch }}
+
       - name: Update Adapters and Core branches
         if: ${{ github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch'}}
         run: |
-          ./.github/scripts/update_dev_packages.sh \
+          ./.github/scripts/update_dev_dependency_branches.sh \
             ${{ inputs.dbt_adapters_branch }} \
-            ${{ inputs.core_branch }}
+            ${{ inputs.dbt_core_branch }} \
+            ${{ inputs.dbt_common_branch }}
+          cat pyproject.toml
 
       - name: Setup postgres
         run: psql -f ./scripts/setup_test_database.sql
@@ -107,7 +148,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-22.04, macos-12]
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
     steps:
       - name: "Check out repository"
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -19,6 +19,10 @@ on:
         description: "Only release Docker image, skip GitHub & PyPI"
         type: boolean
         default: false
+      python_version:
+        description: "Python version for building and testing the build"
+        type: string
+        default: "3.12"
 
 permissions:
   contents: write # this is the permission that allows creating a new release
@@ -53,6 +57,8 @@ jobs:
 
       - name: "Setup `hatch`"
         uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@main
+        with:
+          python-version: ${{ inputs.python_version }}
 
       - name: "Set archive name"
         id: archive

.github/workflows/release_prep_hatch.yml

@@ -77,7 +77,7 @@ defaults:
     shell: bash
 
 env:
-  PYTHON_TARGET_VERSION: 3.11
+  PYTHON_TARGET_VERSION: 3.12
   NOTIFICATION_PREFIX: "[Release Prep]"
 
 jobs:

.github/workflows/unit-tests.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - name: Check out repository

.pre-commit-config.yaml

@@ -27,6 +27,7 @@ repos:
         -   --target-version=py39
         -   --target-version=py310
         -   --target-version=py311
+        -   --target-version=py312
 
 -   repo: https://github.com/pycqa/flake8
     rev: 7.0.0

docker/Dockerfile

@@ -1,5 +1,5 @@
 # this image gets published to GHCR for production use
-ARG py_version=3.11.2
+ARG py_version=3.12.4
 
 FROM python:$py_version-slim-bullseye as base
 

pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
     "psycopg2-binary>=2.9,<3.0",