Merge branch 'main' into required-nullable-annotated

Author: koxudaxi

.github/workflows/codspeed.yaml

@@ -22,13 +22,14 @@ jobs:
       # https://github.com/astral-sh/uv/issues/11006
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.13"
+          python-version: "3.14"
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@v5
       - name: Install dependencies
         run: uv sync --all-extras
       - name: Run benchmarks
-        uses: CodSpeedHQ/action@v3
+        uses: CodSpeedHQ/action@v4
         with:
           token: ${{ secrets.CODSPEED_TOKEN }}
           run: .venv/bin/pytest tests/ --codspeed -n auto
+          mode: "instrumentation"

.github/workflows/test.yaml

@@ -28,6 +28,10 @@ jobs:
           - tox_env: py3.12-black24
           - tox_env: py3.12-black23
           - tox_env: py3.12-black22
+          - tox_env: py3.12-isort7
+          - tox_env: py3.12-isort6
+          - tox_env: py3.12-isort5
+          - tox_env: py3.12-pydantic1
     runs-on: ${{ matrix.os == '' && 'ubuntu-24.04' || matrix.os }}
     env:
       OS: ${{ matrix.os == '' && 'ubuntu-24.04' || matrix.os}}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.34.1
+  rev: 0.35.0
   hooks:
     - id: check-github-workflows
       args: [ "--verbose" ]
@@ -10,12 +10,12 @@ repos:
     - id: tox-ini-fmt
       args: ["-p", "fix"]
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: v2.11.0
+  rev: v2.11.1
   hooks:
     - id: pyproject-fmt
       args: ["--max-supported-python=3.14"]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.14.2'
+  rev: 'v0.14.6'
   hooks:
   - id: ruff-format
     exclude: "^tests/data"

README.md

@@ -380,6 +380,11 @@ Typing customization:
                         Set enum members as default values for enum field
   --strict-types {str,bytes,int,float,bool} [{str,bytes,int,float,bool} ...]
                         Use strict types
+  --type-mappings TYPE_MAPPINGS [TYPE_MAPPINGS ...]
+                        Override default type mappings. Format: "type+format=target" (e.g.,
+                        "string+binary=string" to map binary format to string type) or
+                        "format=target" (e.g., "binary=string"). Can be specified multiple
+                        times.
   --use-annotated       Use typing.Annotated for Field(). Also, `--field-constraints` option
                         will be enabled.
   --use-generic-container-types
@@ -391,10 +396,14 @@ Typing customization:
                         corresponding con* constrained types.
   --use-one-literal-as-default
                         Use one literal as default value for one literal field
+  --use-specialized-enum, --no-use-specialized-enum
+                        Don''t use specialized Enum class (StrEnum, IntEnum) even if the
+                        target Python version supports it
   --use-standard-collections
                         Use standard collections for type hinting (list, dict)
-  --use-subclass-enum   Define Enum class as subclass with field type when enum has type
-                        (int, float, bytes, str)
+  --use-subclass-enum   Define generic Enum class as subclass with field type when enum has
+                        type (int, float, bytes, str)
+  --use-type-alias      Use TypeAlias instead of root models (experimental)
   --use-union-operator  Use | operator for Union type (PEP 604).
   --use-unique-items-as-set
                         define field type as `set` when the field attribute has
@@ -433,6 +442,9 @@ Field customization:
                         default values.
   --use-field-description
                         Use schema description to populate field docstring
+  --use-inline-field-description
+                        Use schema description to populate field docstring as inline
+                        docstring
 
 Model customization:
   --allow-extra-fields  Deprecated: Allow passing extra fields. This flag is deprecated. Use
@@ -518,6 +530,9 @@ General options:
   --debug               show debug message (require "debug". `$ pip install ''datamodel-code-
                         generator[debug]''`)
   --disable-warnings    disable warnings
+  --generate-pyproject-config
+                        Generate pyproject.toml configuration from the provided CLI
+                        arguments and exit
   --no-color            disable colorized output
   --version             show version
   -h, --help            show this help message and exit

docs/index.md

@@ -372,6 +372,11 @@ Typing customization:
                         Set enum members as default values for enum field
   --strict-types {str,bytes,int,float,bool} [{str,bytes,int,float,bool} ...]
                         Use strict types
+  --type-mappings TYPE_MAPPINGS [TYPE_MAPPINGS ...]
+                        Override default type mappings. Format: "type+format=target" (e.g.,
+                        "string+binary=string" to map binary format to string type) or
+                        "format=target" (e.g., "binary=string"). Can be specified multiple
+                        times.
   --use-annotated       Use typing.Annotated for Field(). Also, `--field-constraints` option
                         will be enabled.
   --use-generic-container-types
@@ -383,10 +388,14 @@ Typing customization:
                         corresponding con* constrained types.
   --use-one-literal-as-default
                         Use one literal as default value for one literal field
+  --use-specialized-enum, --no-use-specialized-enum
+                        Don''t use specialized Enum class (StrEnum, IntEnum) even if the
+                        target Python version supports it
   --use-standard-collections
                         Use standard collections for type hinting (list, dict)
-  --use-subclass-enum   Define Enum class as subclass with field type when enum has type
-                        (int, float, bytes, str)
+  --use-subclass-enum   Define generic Enum class as subclass with field type when enum has
+                        type (int, float, bytes, str)
+  --use-type-alias      Use TypeAlias instead of root models (experimental)
   --use-union-operator  Use | operator for Union type (PEP 604).
   --use-unique-items-as-set
                         define field type as `set` when the field attribute has
@@ -425,6 +434,9 @@ Field customization:
                         default values.
   --use-field-description
                         Use schema description to populate field docstring
+  --use-inline-field-description
+                        Use schema description to populate field docstring as inline
+                        docstring
 
 Model customization:
   --allow-extra-fields  Deprecated: Allow passing extra fields. This flag is deprecated. Use
@@ -510,6 +522,9 @@ General options:
   --debug               show debug message (require "debug". `$ pip install ''datamodel-code-
                         generator[debug]''`)
   --disable-warnings    disable warnings
+  --generate-pyproject-config
+                        Generate pyproject.toml configuration from the provided CLI
+                        arguments and exit
   --no-color            disable colorized output
   --version             show version
   -h, --help            show this help message and exit