Merge branch 'main' into integration_workflow_update

dbt-labs · Jul 24, 2024 · ecd0ea6 · ecd0ea6
2 parents 4d63b29 + f95b919
commit ecd0ea6
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 13 deletions.
diff --git a/.changes/unreleased/Under the Hood-20240719-125618.yaml b/.changes/unreleased/Under the Hood-20240719-125618.yaml
@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Remove `freezegun` as a testing dependency; this package is no longer used
+time: 2024-07-19T12:56:18.957049-04:00
+custom:
+  Author: mikealfare
+  Issue: "1136"
diff --git a/.changes/unreleased/Under the Hood-20240722-143114.yaml b/.changes/unreleased/Under the Hood-20240722-143114.yaml
@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Add support for Python 3.12
+time: 2024-07-22T14:31:14.024865-07:00
+custom:
+  Author: versusfacit
+  Issue: "903"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,13 +5,25 @@ updates:
     schedule:
       interval: "daily"
     rebase-strategy: "disabled"
+    ignore:
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-patch
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     rebase-strategy: "disabled"
+    ignore:
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-patch
   - package-ecosystem: "docker"
     directory: "/docker"
     schedule:
       interval: "weekly"
     rebase-strategy: "disabled"
+    ignore:
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-patch
diff --git a/.github/scripts/integration-test-matrix.js b/.github/scripts/integration-test-matrix.js
@@ -1,6 +1,6 @@
 module.exports = ({ context }) => {
   const defaultPythonVersion = "3.8";
-  const supportedPythonVersions = ["3.8", "3.9", "3.10", "3.11"];
+  const supportedPythonVersions = ["3.8", "3.9", "3.10", "3.11", "3.12"];
   const supportedAdapters = ["snowflake"];
 
   // if PR, generate matrix based on files changed and PR labels

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -246,18 +246,18 @@ jobs:
           DBT_TEST_USER_3: dbt_test_role_3
         run: tox -- --ddtrace
 
+      - name: Get current date
+        if: always()
+        id: date
+        run: echo "date=$(date +'%Y-%m-%dT%H_%M_%S')" >> $GITHUB_OUTPUT #no colons allowed for artifacts
+
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: logs
+          name: logs_${{ matrix.python-version }}_${{ matrix.os }}_${{ matrix.adapter }}-${{ steps.date.outputs.date }}
           path: ./logs
           overwrite: true
 
-      - name: Get current date
-        if: always()
-        id: date
-        run: echo "date=$(date +'%Y-%m-%dT%H_%M_%S')" >> $GITHUB_OUTPUT #no colons allowed for artifacts
-
       - uses: actions/upload-artifact@v4
         if: always()
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,7 +71,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']
 
     env:
       TOXENV: "unit"
@@ -175,7 +175,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-12, windows-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,6 +28,7 @@ repos:
         -   --target-version=py39
         -   --target-version=py310
         -   --target-version=py311
+        -   --target-version=py312
         additional_dependencies: [flaky]
 
 -   repo: https://github.com/pycqa/flake8

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -11,7 +11,6 @@ pre-commit~=3.5.0;python_version<"3.9"
 
 # test
 ddtrace==2.3.0
-freezegun~=1.4
 pytest~=7.4
 pytest-csv~=3.0
 pytest-dotenv~=0.5.2

diff --git a/setup.py b/setup.py
@@ -77,6 +77,7 @@ def _plugin_version() -> str:
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     python_requires=">=3.8",
 )
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 skipsdist = True
-envlist = py38,py39,py310,py311
+envlist = py38,py39,py310,py311,py312
 
-[testenv:{unit,py38,py39,py310,py311,py}]
+[testenv:{unit,py38,py39,py310,py311,py312,py}]
 description = unit testing
 skip_install = true
 passenv =
@@ -13,7 +13,7 @@ deps =
   -rdev-requirements.txt
   -e.
 
-[testenv:{integration,py38,py39,py310,py311,py}-{snowflake}]
+[testenv:{integration,py38,py39,py310,py311,py312,py}-{snowflake}]
 description = adapter plugin integration testing
 skip_install = true
 passenv =