From fe66dd91040a3d73419d2820af6fb880aa0fcc04 Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Wed, 14 Feb 2024 15:31:49 +0100
Subject: [PATCH 1/2] Python 3.12 support

---
 .github/workflows/test.yml | 2 +-
 setup.py                   | 1 +
 tox.ini                    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 882ffcf..f4bd58c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     # Service containers to run with `container-job`
     services:
diff --git a/setup.py b/setup.py
index b54f6b9..5a7d898 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,7 @@ def read(*parts):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Internet :: WWW/HTTP",
     ],
     extras_require={
diff --git a/tox.ini b/tox.ini
index bd447f2..2b51579 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist =
     py311-docs
     py{37,38,39,310}-dj32
     py{38,39,310,311}-dj{40,41,42}
-    py{310,311}-dj{50}
+    py{310,311,312}-dj{50}
     py{37,38,39,310,311}-fl{20,21,22}
     py{37,38,39,310,311}-s{21,22}
 
@@ -17,6 +17,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv]
 usedevelop = true

From ddfa39c420188aa59cafc21a857643a7ee82d04f Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Wed, 14 Feb 2024 18:22:16 +0100
Subject: [PATCH 2/2] Add 'taskName' to excluded fields

---
 src/dockerflow/logging.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dockerflow/logging.py b/src/dockerflow/logging.py
index d4e260b..081d808 100644
--- a/src/dockerflow/logging.py
+++ b/src/dockerflow/logging.py
@@ -65,6 +65,7 @@ class JsonLogFormatter(logging.Formatter):
             "processName",
             "relativeCreated",
             "stack_info",
+            "taskName",
             "thread",
             "threadName",
         )