Update to Python 3.12

.python-version

@@ -1 +1 @@
-3.11
+3.12

celerpy/cli.py

@@ -1,12 +1,11 @@
 # Copyright 2024 UT-Battelle, LLC, and other Celeritas developers.
 # See the top-level LICENSE file for details.
 # SPDX-License-Identifier: Apache-2.0
-from typing import Optional
+from typing import Annotated, Optional
 
 import typer
 from pydantic import ValidationError
 from rich import print as rprint
-from typing_extensions import Annotated
 
 app = typer.Typer()
 

celerpy/model.py

@@ -4,7 +4,7 @@
 """Manage models used for JSON I/O with Celeritas."""
 
 from enum import Enum
-from typing import Annotated, List, Literal, Optional
+from typing import Annotated, Literal, Optional
 
 from pydantic import (
     BaseModel,
@@ -129,7 +129,7 @@ class TraceInput(TraceSetup):
 class TraceOutput(_Model):
     trace: TraceSetup
     image: ImageParams
-    volumes: Optional[List[str]] = None
+    volumes: Optional[list[str]] = None
     sizeof_int: PositiveInt
 
 

requirements-dev.txt

@@ -1,97 +1,137 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --output-file=requirements-dev.txt --extra=dev pyproject.toml
-annotated-types==0.6.0
+annotated-types==0.7.0
     # via pydantic
-attrs==23.2.0
+attrs==25.3.0
     # via glom
-boltons==24.0.0
+boltons==25.0.0
     # via
     #   face
     #   glom
-build==1.2.1
+build==1.2.2.post1
+    # via celerpy (pyproject.toml)
 cfgv==3.4.0
     # via pre-commit
-click==8.1.7
+click==8.1.8
     # via typer
-coverage==7.5.1
+contourpy==1.3.1
+    # via matplotlib
+coverage==7.8.0
     # via pytest-cov
+cycler==0.12.1
+    # via matplotlib
 dapperdata==0.4.0
-distlib==0.3.8
+    # via celerpy (pyproject.toml)
+distlib==0.3.9
     # via virtualenv
-face==20.1.1
+face==24.0.0
     # via glom
-filelock==3.14.0
+filelock==3.18.0
     # via virtualenv
-glom==23.5.0
-identify==2.5.36
+fonttools==4.57.0
+    # via matplotlib
+glom==24.11.0
+    # via celerpy (pyproject.toml)
+identify==2.6.9
     # via pre-commit
-iniconfig==2.0.0
+iniconfig==2.1.0
     # via pytest
+kiwisolver==1.4.8
+    # via matplotlib
 markdown-it-py==3.0.0
     # via rich
+matplotlib==3.10.1
+    # via celerpy (pyproject.toml)
 mdurl==0.1.2
     # via markdown-it-py
-mypy==1.10.0
+mypy==1.15.0
+    # via celerpy (pyproject.toml)
 mypy-extensions==1.0.0
     # via mypy
-nodeenv==1.8.0
+nodeenv==1.9.1
     # via pre-commit
-numpy==1.26.4
-packaging==24.0
+numpy==2.2.4
+    # via
+    #   celerpy (pyproject.toml)
+    #   contourpy
+    #   matplotlib
+packaging==24.2
     # via
     #   build
+    #   matplotlib
     #   pytest
-platformdirs==4.2.1
+pillow==11.1.0
+    # via matplotlib
+platformdirs==4.3.7
     # via virtualenv
 pluggy==1.5.0
     # via pytest
-pre-commit==3.7.0
-pydantic==2.7.1
+pre-commit==4.2.0
+    # via celerpy (pyproject.toml)
+pydantic==2.11.2
     # via
+    #   celerpy (pyproject.toml)
     #   dapperdata
     #   pydantic-settings
-pydantic-core==2.18.2
+pydantic-core==2.33.1
     # via pydantic
-pydantic-settings==2.2.1
-    # via dapperdata
-pygments==2.18.0
+pydantic-settings==2.8.1
+    # via
+    #   celerpy (pyproject.toml)
+    #   dapperdata
+pygments==2.19.1
     # via rich
-pyproject-hooks==1.1.0
+pyparsing==3.2.3
+    # via matplotlib
+pyproject-hooks==1.2.0
     # via build
-pytest==8.2.0
+pytest==8.3.5
     # via
+    #   celerpy (pyproject.toml)
     #   pytest-cov
     #   pytest-pretty
-pytest-cov==5.0.0
+pytest-cov==6.1.0
+    # via celerpy (pyproject.toml)
 pytest-pretty==1.2.0
-python-dotenv==1.0.1
+    # via celerpy (pyproject.toml)
+python-dateutil==2.9.0.post0
+    # via matplotlib
+python-dotenv==1.1.0
     # via pydantic-settings
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via pre-commit
-rich==13.7.1
+rich==14.0.0
     # via
     #   pytest-pretty
     #   typer
-ruamel-yaml==0.18.6
-    # via dapperdata
-ruamel-yaml-clib==0.2.8
-    # via ruamel-yaml
-ruff==0.4.4
-setuptools==69.5.1
-    # via nodeenv
+ruamel-yaml==0.18.10
+    # via
+    #   celerpy (pyproject.toml)
+    #   dapperdata
+ruff==0.11.4
+    # via celerpy (pyproject.toml)
 shellingham==1.5.4
     # via typer
-toml-sort==0.23.1
-tomlkit==0.12.5
+six==1.17.0
+    # via python-dateutil
+toml-sort==0.24.2
+    # via celerpy (pyproject.toml)
+tomlkit==0.13.2
     # via toml-sort
-typer==0.12.3
-    # via dapperdata
-typing-extensions==4.11.0
+typer==0.15.2
+    # via
+    #   celerpy (pyproject.toml)
+    #   dapperdata
+typing-extensions==4.13.1
     # via
     #   mypy
     #   pydantic
     #   pydantic-core
     #   typer
-uv==0.1.42
-virtualenv==20.26.1
+    #   typing-inspection
+typing-inspection==0.4.0
+    # via pydantic
+uv==0.6.12
+    # via celerpy (pyproject.toml)
+virtualenv==20.30.0
     # via pre-commit

requirements.txt

@@ -1,30 +1,61 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --output-file=requirements.txt pyproject.toml
-annotated-types==0.6.0
+annotated-types==0.7.0
     # via pydantic
-click==8.1.7
+click==8.1.8
     # via typer
+contourpy==1.3.1
+    # via matplotlib
+cycler==0.12.1
+    # via matplotlib
+fonttools==4.57.0
+    # via matplotlib
+kiwisolver==1.4.8
+    # via matplotlib
 markdown-it-py==3.0.0
     # via rich
+matplotlib==3.10.1
+    # via celerpy (pyproject.toml)
 mdurl==0.1.2
     # via markdown-it-py
-numpy==1.26.4
-pydantic==2.7.1
-    # via pydantic-settings
-pydantic-core==2.18.2
+numpy==2.2.4
+    # via
+    #   celerpy (pyproject.toml)
+    #   contourpy
+    #   matplotlib
+packaging==24.2
+    # via matplotlib
+pillow==11.1.0
+    # via matplotlib
+pydantic==2.11.2
+    # via
+    #   celerpy (pyproject.toml)
+    #   pydantic-settings
+pydantic-core==2.33.1
     # via pydantic
-pydantic-settings==2.2.1
-pygments==2.18.0
+pydantic-settings==2.8.1
+    # via celerpy (pyproject.toml)
+pygments==2.19.1
     # via rich
-python-dotenv==1.0.1
+pyparsing==3.2.3
+    # via matplotlib
+python-dateutil==2.9.0.post0
+    # via matplotlib
+python-dotenv==1.1.0
     # via pydantic-settings
-rich==13.7.1
+rich==14.0.0
     # via typer
 shellingham==1.5.4
     # via typer
-typer==0.12.3
-typing-extensions==4.11.0
+six==1.17.0
+    # via python-dateutil
+typer==0.15.2
+    # via celerpy (pyproject.toml)
+typing-extensions==4.13.1
     # via
     #   pydantic
     #   pydantic-core
     #   typer
+    #   typing-inspection
+typing-inspection==0.4.0
+    # via pydantic