diff --git a/pycfmodel/model/cf_model.py b/pycfmodel/model/cf_model.py index ff9acef..40f973a 100644 --- a/pycfmodel/model/cf_model.py +++ b/pycfmodel/model/cf_model.py @@ -1,7 +1,8 @@ from datetime import date -from typing import Annotated, Any, ClassVar, Collection, Dict, List, Optional, Type, Union +from typing import Any, ClassVar, Collection, Dict, List, Optional, Type, Union from pydantic import Field +from typing_extensions import Annotated from pycfmodel.action_expander import expand_actions from pycfmodel.constants import AWS_NOVALUE diff --git a/pycfmodel/model/types.py b/pycfmodel/model/types.py index c10f7c9..3fad653 100644 --- a/pycfmodel/model/types.py +++ b/pycfmodel/model/types.py @@ -2,7 +2,7 @@ from base64 import b64decode from datetime import date, datetime from ipaddress import IPv4Network, IPv6Network -from typing import Any, List, TypeVar, Union +from typing import Any, List, TypeVar, Union, Type from pydantic import BeforeValidator, Field, GetCoreSchemaHandler from pydantic._internal import _schema_generation_shared @@ -30,7 +30,7 @@ def __get_pydantic_json_schema__( @classmethod def __get_pydantic_core_schema__( cls, - _source: type[Any], + _source: Type[Any], _handler: GetCoreSchemaHandler, ) -> core_schema.CoreSchema: return core_schema.no_info_plain_validator_function( @@ -59,7 +59,7 @@ def __get_pydantic_json_schema__( @classmethod def __get_pydantic_core_schema__( cls, - _source: type[Any], + _source: Type[Any], _handler: GetCoreSchemaHandler, ) -> core_schema.CoreSchema: return core_schema.no_info_plain_validator_function( @@ -97,7 +97,7 @@ def __get_pydantic_json_schema__( @classmethod def __get_pydantic_core_schema__( cls, - _source: type[Any], + _source: Type[Any], _handler: GetCoreSchemaHandler, ) -> core_schema.CoreSchema: return core_schema.no_info_plain_validator_function( diff --git a/requirements-dev.txt b/requirements-dev.txt index cd6333f..fce7de1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make freeze @@ -11,10 +11,12 @@ build==1.2.1 certifi==2024.6.2 click==8.1.7 coverage[toml]==7.5.3 +exceptiongroup==1.2.1 h11==0.14.0 httpcore==1.0.5 httpx==0.27.0 idna==3.7 +importlib-metadata==7.1.0 iniconfig==2.0.0 isort==5.13.2 mypy-extensions==1.0.0 @@ -31,8 +33,10 @@ pytest-cov==5.0.0 pytest-repeat==0.9.3 ruff==0.4.8 sniffio==1.3.1 +tomli==2.0.1 typing-extensions==4.12.2 wheel==0.43.0 +zipp==3.19.2 # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements-docs.txt b/requirements-docs.txt index 6055e5a..8079a9f 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make freeze diff --git a/requirements.txt b/requirements.txt index 5701176..25d90a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make freeze