fix: poetry update again + pydantic as optional

Author: Ran Isenberg

Diff for: Makefile

@@ -5,7 +5,7 @@ target:
 dev:
 	pip install --upgrade pip poetry pre-commit
 	poetry install
-	poetry install --extras "advanced_parser"
+	poetry install --extras "pydantic"
 	pre-commit install
 
 dev-docs:

Diff for: aws_lambda_powertools/utilities/advanced_parser/envelopes/dynamodb.py

@@ -1,10 +1,9 @@
 import logging
 from typing import Any, Dict
 
-from pydantic import BaseModel, ValidationError
-
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.base import BaseEnvelope
 from aws_lambda_powertools.utilities.advanced_parser.schemas import DynamoDBSchema
+from pydantic import BaseModel, ValidationError
 
 logger = logging.getLogger(__name__)
 

Diff for: aws_lambda_powertools/utilities/advanced_parser/envelopes/envelopes.py

@@ -2,12 +2,11 @@
 from enum import Enum
 from typing import Any, Dict
 
-from pydantic import BaseModel
-
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.base import BaseEnvelope
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.dynamodb import DynamoDBEnvelope
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.event_bridge import EventBridgeEnvelope
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.sqs import SqsEnvelope
+from pydantic import BaseModel
 
 logger = logging.getLogger(__name__)
 

Diff for: aws_lambda_powertools/utilities/advanced_parser/envelopes/event_bridge.py

@@ -1,10 +1,9 @@
 import logging
 from typing import Any, Dict
 
-from pydantic import BaseModel, ValidationError
-
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.base import BaseEnvelope
 from aws_lambda_powertools.utilities.advanced_parser.schemas import EventBridgeSchema
+from pydantic import BaseModel, ValidationError
 
 logger = logging.getLogger(__name__)
 

Diff for: aws_lambda_powertools/utilities/advanced_parser/envelopes/sqs.py

@@ -1,10 +1,9 @@
 import logging
 from typing import Any, Dict, List
 
-from pydantic import BaseModel, ValidationError
-
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.base import BaseEnvelope
 from aws_lambda_powertools.utilities.advanced_parser.schemas import SqsSchema
+from pydantic import BaseModel, ValidationError
 
 logger = logging.getLogger(__name__)
 

Diff for: aws_lambda_powertools/utilities/advanced_parser/parser.py

@@ -1,10 +1,9 @@
 import logging
 from typing import Any, Callable, Dict, Optional
 
-from pydantic import BaseModel, ValidationError
-
 from aws_lambda_powertools.middleware_factory import lambda_handler_decorator
 from aws_lambda_powertools.utilities.advanced_parser.envelopes import Envelope, parse_envelope
+from pydantic import BaseModel, ValidationError
 
 logger = logging.getLogger(__name__)
 

Diff for: poetry.lock

@@ -23,6 +23,7 @@ aws-xray-sdk = "^2.5.0"
 fastjsonschema = "^2.14.5"
 boto3 = "^1.12"
 jmespath = "^0.10.0"
+pydantic = {version = "^1.6.0", optional = true }
 
 [tool.poetry.dev-dependencies]
 coverage = {extras = ["toml"], version = "^5.0.3"}
@@ -36,6 +37,7 @@ flake8-debugger = "^3.2.1"
 flake8-fixme = "^1.1.1"
 flake8-isort = "^2.8.0"
 flake8-variables-names = "^0.0.3"
+flake8_polyfill = "^1.0.2"
 isort = "^4.3.21"
 pytest-cov = "^2.8.1"
 pytest-mock = "^2.0.0"
@@ -46,11 +48,10 @@ radon = "^4.1.0"
 xenon = "^0.7.0"
 flake8-eradicate = "^0.3.0"
 flake8-bugbear = "^20.1.4"
-pydantic = {version = "^1.6.0", optional = true }
 
 
 [tool.poetry.extras]
-advanced_parser = ["pydantic"]
+pydantic = ["pydantic"]
 
 [tool.coverage.run]
 source = ["aws_lambda_powertools"]

Diff for: pyproject.toml

@@ -1,8 +1,5 @@
 from typing import Dict, List, Optional
 
-from pydantic import BaseModel
-from typing_extensions import Literal
-
 from aws_lambda_powertools.utilities.advanced_parser.schemas import (
     DynamoDBSchema,
     DynamoRecordSchema,
@@ -11,6 +8,8 @@
     SqsRecordSchema,
     SqsSchema,
 )
+from pydantic import BaseModel
+from typing_extensions import Literal
 
 
 class MyDynamoBusiness(BaseModel):

Diff for: tests/functional/parser/schemas.py

@@ -1,11 +1,11 @@
 from typing import Dict, List
 
 import pytest
-from pydantic.error_wrappers import ValidationError
 
 from aws_lambda_powertools.utilities.advanced_parser.envelopes.envelopes import Envelope
 from aws_lambda_powertools.utilities.advanced_parser.parser import parser
 from aws_lambda_powertools.utilities.typing import LambdaContext
+from pydantic.error_wrappers import ValidationError
 from tests.functional.parser.schemas import MyAdvancedDynamoBusiness, MyDynamoBusiness
 from tests.functional.parser.utils import load_event