Merge branch 'master' into dependabot/pip/charset-normalizer-3.3.1

koxudaxi · Oct 24, 2023 · fbd5c01 · fbd5c01
2 parents 2268cae + e93a28e
commit fbd5c01
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 159 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,11 +10,11 @@ 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"]
         os: [ubuntu-latest, windows-latest, macos-latest]
         isort-version: [4.3.21, 5.6.4]
         black-version: [22.1.0, default]
-        pydantic-version: [1.5.1, 1.10.9, default]
+        pydantic-version: [1.5.1, 1.10.9, 2.4.2]
         include:
           - os: ubuntu-latest
             isort-version: 5.6.4
@@ -40,6 +40,8 @@ jobs:
             pydantic-version: 1.5.1
           - python-version: 3.11
             pydantic-version: 1.5.1
+          - python-version: 3.12
+            pydantic-version: 1.5.1
     defaults:
       run:
         shell: bash

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.0-alpine3.16 as builder
+FROM python:3.12.0-alpine3.17 as builder
 
 LABEL maintainer="Koudai Aono <[email protected]>"
 

diff --git a/datamodel_code_generator/format.py b/datamodel_code_generator/format.py
@@ -19,6 +19,7 @@ class PythonVersion(Enum):
     PY_39 = '3.9'
     PY_310 = '3.10'
     PY_311 = '3.11'
+    PY_312 = '3.12'
 
     @cached_property
     def _is_py_38_or_later(self) -> bool:  # pragma: no cover