Merge branch 'master' into disable_alias

Author: axellpadilla

.devcontainer/devcontainer.json

@@ -1,11 +1,24 @@
 {
     "name": "Python 3",
-    "image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/python:3.10-bookworm",
     "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2.17.0": {
+            "moby": false
+        }
+    },
+    "forwardPorts": [
+        1433
+    ],
+    "postStartCommand": "/bin/bash ./.devcontainer/setup_odbc.sh && /bin/bash ./.devcontainer/setup_env.sh",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "python-envs.alwaysUseUv": true,
+                "python-envs.terminal.autoActivationType": "shellStartup",
+                "python.defaultInterpreterPath": "${containerWorkspaceFolder}/.venv/bin/python"
+            }
+        }
     },
-    "forwardPorts": [1433],
-    "postStartCommand": "/bin/bash ./.devcontainer/setup_odbc.sh & /bin/bash ./.devcontainer/setup_env.sh",
     "containerEnv": {
         "SQLSERVER_TEST_DRIVER": "ODBC Driver 18 for SQL Server",
         "SQLSERVER_TEST_HOST": "127.0.0.1",

.devcontainer/setup_env.sh

@@ -1,6 +1,16 @@
+set -euo pipefail
+
 cp test.env.sample test.env
 
 docker compose build
 docker compose up -d
 
-pip install -r dev_requirements.txt
+# Install uv in the container user environment.
+pip install uv
+
+# Use a workspace-local virtualenv so package installs do not fail on user permissions.
+[ -d .venv ] || uv venv
+source .venv/bin/activate
+
+uv sync --group dev --extra pyodbc
+pre-commit install

.devcontainer/setup_odbc.sh

@@ -1,4 +1,6 @@
-curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
+curl https://packages.microsoft.com/keys/microsoft.asc \
+  | gpg --dearmor \
+  | sudo tee /usr/share/keyrings/microsoft-prod.gpg >/dev/null
 
 #Download appropriate package for the OS version
 #Choose only ONE of the following, corresponding to your OS version

.github/dependabot.yml

@@ -1,15 +1,46 @@
----
 version: 2
+
 updates:
-  - package-ecosystem: pip
+  - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: daily
-  - package-ecosystem: github-actions
+      interval: "weekly"
+    groups:
+      pip-updates:
+        applies-to: "version-updates"
+        patterns:
+          - "*"
+      pip-security:
+        applies-to: "security-updates"
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: daily
-  - package-ecosystem: docker
-    directory: "/"
+      interval: "weekly"
+    groups:
+      github-actions-updates:
+        applies-to: "version-updates"
+        patterns:
+          - "*"
+      github-actions-security:
+        applies-to: "security-updates"
+        patterns:
+          - "*"
+
+  - package-ecosystem: "docker"
+    directories:
+      - "/"
+      - "/devops"
     schedule:
-      interval: daily
+      interval: "weekly"
+    groups:
+      docker-updates:
+        applies-to: "version-updates"
+        patterns:
+          - "*"
+      docker-security:
+        applies-to: "security-updates"
+        patterns:
+          - "*"

.github/scripts/verify_version.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+"""Verify the packaged version matches the release git tag.
+
+Usage:
+    python .github/scripts/verify_version.py <tag>
+
+The tag typically comes from ``$GITHUB_REF_NAME`` and may be prefixed with
+``v`` (e.g. ``v1.9.1``). The leading ``v`` is stripped before comparison.
+
+Exits 0 on match, 1 on mismatch, 2 on usage error.
+"""
+from __future__ import annotations
+
+import re
+import sys
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+VERSION_FILE = REPO_ROOT / "dbt" / "adapters" / "sqlserver" / "__version__.py"
+VERSION_RE = re.compile(r"""version\s*=\s*["'](?P<version>.+?)["']""")
+
+
+def read_package_version(version_file: Path = VERSION_FILE) -> str:
+    match = VERSION_RE.search(version_file.read_text())
+    if not match:
+        raise ValueError(f"could not find version in {version_file}")
+    return match.group("version")
+
+
+def main(argv: list[str]) -> int:
+    if len(argv) != 2:
+        print("usage: verify_version.py <tag>", file=sys.stderr)
+        return 2
+    tag_version = argv[1].lstrip("v")
+    pkg_version = read_package_version()
+    if tag_version != pkg_version:
+        print(
+            f"Git tag {tag_version!r} does not match " f"package version {pkg_version!r}",
+            file=sys.stderr,
+        )
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

.github/workflows/integration-tests-sqlserver.yml

@@ -6,19 +6,40 @@ on:  # yamllint disable-line rule:truthy
     branches:
       - master
       - v*
+    paths:
+      - 'dbt/**'
+      - 'tests/functional/**'
+      - 'devops/**'
+      - 'docker-compose.yml'
+      - '**/*.lock'
+      - '.locks/**'
+      - 'pyproject.toml'
+      - 'pytest.ini'
+      - '.github/workflows/integration-tests-sqlserver.yml'
   pull_request:
     branches:
       - master
       - v*
+    paths:
+      - 'dbt/**'
+      - 'tests/functional/**'
+      - 'devops/**'
+      - 'docker-compose.yml'
+      - '**/*.lock'
+      - '.locks/**'
+      - 'pyproject.toml'
+      - 'pytest.ini'
+      - '.github/workflows/integration-tests-sqlserver.yml'
   schedule:
     - cron: '0 22 * * 0'
 
 jobs:
   integration-tests-sql-server:
     name: Regular
+    if: github.actor != 'dependabot[bot]'
     strategy:
       matrix:
-        python_version: ["3.9", "3.10", "3.11", "3.12"]
+        python_version: ["3.10", "3.11", "3.12", "3.13"]
         msodbc_version: ["17", "18"]
         sqlserver_version: ["2017", "2019", "2022"]
         collation: ["SQL_Latin1_General_CP1_CS_AS", "SQL_Latin1_General_CP1_CI_AS"]
@@ -36,10 +57,13 @@ jobs:
           DBT_TEST_USER_3: DBT_TEST_USER_3
           COLLATION: ${{ matrix.collation }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+
+      - name: Install uv
+        run: pip install uv
 
       - name: Install dependencies
-        run: pip install -r dev_requirements.txt
+        run: uv pip install --system -e ".[pyodbc]" --group dev
 
       - name: Run functional tests
         run: pytest -ra -v tests/functional --profile "ci_sql_server"

.github/workflows/publish-docker.yml

@@ -12,18 +12,18 @@ jobs:
   publish-docker-client:
     strategy:
       matrix:
-        python_version: ["3.9", "3.10", "3.11", "3.12"]
+        python_version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         docker_target: ["msodbc17", "msodbc18"]
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -50,10 +50,10 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/release-version.yml

@@ -11,17 +11,17 @@ jobs:
     name: Release new version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
-      - name: Install dependencies
-        run: pip install -r dev_requirements.txt
+      - name: Install build tooling
+        run: pip install build twine
 
-      - name: Verify version match
-        run: python setup.py verify
+      - name: Verify version matches tag
+        run: python .github/scripts/verify_version.py "${{ github.ref_name }}"
 
       - name: Initialize .pypirc
         run: |
@@ -31,5 +31,5 @@ jobs:
 
       - name: Build and publish package
         run: |
-          python setup.py sdist bdist_wheel
+          python -m build
           twine upload dist/*

.github/workflows/unit-tests.yml

@@ -18,7 +18,7 @@ jobs:
     name: Unit tests
     strategy:
       matrix:
-        python_version: ["3.9", "3.10", "3.11", "3.12"]
+        python_version: ["3.10", "3.11", "3.12", "3.13"]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -30,10 +30,13 @@ jobs:
         password: ${{ secrets.github_token }}
     steps:
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+
+      - name: Install uv
+        run: pip install uv
 
       - name: Install dependencies
-        run: pip install -r dev_requirements.txt
+        run: uv pip install --system -e ".[pyodbc]" --group dev
 
       - name: Run unit tests
         run: pytest -n auto -ra -v tests/unit

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
     hooks:
       - id: absolufy-imports
   - repo: 'https://github.com/hadialqattan/pycln'
-    rev: v2.5.0
+    rev: v2.6.0
     hooks:
       - id: pycln
         args: