Bump Pydantic to fix mypy plugin (#619)

droserasprout · web-flow · commit 70b60fe79058 · 2023-03-09T03:04:11.000+04:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,7 +32,7 @@ python = ">=3.10,<3.11"
 
 asyncpg = "0.27.0"
 datamodel-code-generator = "0.17.1"
-pydantic = "1.10.5"
+pydantic = "1.10.6"
 pysignalr = "0.1.2"
 tortoise-orm = "0.19.3"
 
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -41,7 +41,7 @@ jsonschema-spec==0.1.3 ; python_version >= "3.10" and python_version < "3.11"
 jsonschema==4.17.3 ; python_version >= "3.10" and python_version < "3.11"
 lazy-object-proxy==1.9.0 ; python_version >= "3.10" and python_version < "3.11"
 markupsafe==2.1.2 ; python_version >= "3.10" and python_version < "3.11"
-msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
+msgpack==1.0.5 ; python_version >= "3.10" and python_version < "3.11"
 multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
 mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
 mypy==1.1.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -55,8 +55,8 @@ platformdirs==3.1.0 ; python_version >= "3.10" and python_version < "3.11"
 pluggy==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
 prance==0.22.2.22.0 ; python_version >= "3.10" and python_version < "3.11"
 prometheus-client==0.14.1 ; python_version >= "3.10" and python_version < "3.11"
-pydantic==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
-pydantic[email]==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
+pydantic==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
+pydantic[email]==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
 pydash==6.0.2 ; python_version >= "3.10" and python_version < "3.11"
 pygments==2.14.0 ; python_version >= "3.10" and python_version < "3.11"
 pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/requirements.pytezos.txt b/requirements.pytezos.txt
@@ -39,7 +39,7 @@ dnspython==2.3.0 ; python_version >= "3.10" and python_version < "3.11"
 docker==6.0.1 ; python_version >= "3.10" and python_version < "3.11"
 email-validator==1.3.1 ; python_version >= "3.10" and python_version < "3.11"
 eth-hash==0.5.1 ; python_version >= "3.10" and python_version < "3.11"
-eth-typing==3.2.0 ; python_version >= "3.10" and python_version < "3.11"
+eth-typing==3.3.0 ; python_version >= "3.10" and python_version < "3.11"
 eth-utils==2.1.0 ; python_version >= "3.10" and python_version < "3.11"
 exceptiongroup==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
 executing==1.2.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -74,7 +74,7 @@ markupsafe==2.1.2 ; python_version >= "3.10" and python_version < "3.11"
 matplotlib-inline==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
 mistune==2.0.5 ; python_version >= "3.10" and python_version < "3.11"
 mnemonic==0.20 ; python_version >= "3.10" and python_version < "3.11"
-msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
+msgpack==1.0.5 ; python_version >= "3.10" and python_version < "3.11"
 multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
 mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
 nbclassic==0.5.3 ; python_version >= "3.10" and python_version < "3.11"
@@ -105,8 +105,8 @@ ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "3.11" and os_
 pure-eval==0.2.2 ; python_version >= "3.10" and python_version < "3.11"
 py-ecc==6.0.0 ; python_version >= "3.10" and python_version < "3.11"
 pycparser==2.21 ; python_version >= "3.10" and python_version < "3.11"
-pydantic==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
-pydantic[email]==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
+pydantic==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
+pydantic[email]==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
 pygments==2.14.0 ; python_version >= "3.10" and python_version < "3.11"
 pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
 pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/requirements.slim.txt b/requirements.slim.txt
@@ -14,11 +14,11 @@ colorama==0.4.6 ; python_version >= "3.10" and python_version < "3.11" and platf
 frozenlist==1.3.3 ; python_version >= "3.10" and python_version < "3.11"
 idna==3.4 ; python_version >= "3.10" and python_version < "3.11"
 iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
-msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
+msgpack==1.0.5 ; python_version >= "3.10" and python_version < "3.11"
 multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
 orjson==3.8.7 ; python_version >= "3.10" and python_version < "3.11"
 prometheus-client==0.14.1 ; python_version >= "3.10" and python_version < "3.11"
-pydantic==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
+pydantic==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
 pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
 pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
 pysignalr==0.1.2 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/requirements.txt b/requirements.txt
@@ -30,7 +30,7 @@ jsonschema-spec==0.1.3 ; python_version >= "3.10" and python_version < "3.11"
 jsonschema==4.17.3 ; python_version >= "3.10" and python_version < "3.11"
 lazy-object-proxy==1.9.0 ; python_version >= "3.10" and python_version < "3.11"
 markupsafe==2.1.2 ; python_version >= "3.10" and python_version < "3.11"
-msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
+msgpack==1.0.5 ; python_version >= "3.10" and python_version < "3.11"
 multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
 mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
 openapi-schema-validator==0.3.4 ; python_version >= "3.10" and python_version < "3.11"
@@ -42,8 +42,8 @@ pathspec==0.11.0 ; python_version >= "3.10" and python_version < "3.11"
 platformdirs==3.1.0 ; python_version >= "3.10" and python_version < "3.11"
 prance==0.22.2.22.0 ; python_version >= "3.10" and python_version < "3.11"
 prometheus-client==0.14.1 ; python_version >= "3.10" and python_version < "3.11"
-pydantic==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
-pydantic[email]==1.10.5 ; python_version >= "3.10" and python_version < "3.11"
+pydantic==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
+pydantic[email]==1.10.6 ; python_version >= "3.10" and python_version < "3.11"
 pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
 pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
 pyrsistent==0.19.3 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/scripts/update_cookiecutter.py b/scripts/update_cookiecutter.py
@@ -4,6 +4,6 @@
 from dipdup.project import BaseProject
 
 path = Path(__file__).parent.parent / 'docs' / 'cookiecutter.json'
-project = BaseProject()  # type: ignore[call-arg]
+project = BaseProject()
 project.run(quiet=True, replay=None)
 project.write_cookiecutter_json(path)
diff --git a/scripts/update_demos.py b/scripts/update_demos.py
@@ -28,7 +28,7 @@ def _get_projects() -> list[Path]:
         continue
 
     print(f'=> Updating {project_path.name}')
-    project = BaseProject()  # type: ignore[call-arg]
+    project = BaseProject()
     project.run(quiet=True, replay=str(project_path))
     project.render(force=True)
 
diff --git a/src/dipdup/cli.py b/src/dipdup/cli.py
@@ -539,7 +539,7 @@ async def new(
     """Create a new project interactively."""
     from dipdup.project import BaseProject
 
-    project = BaseProject()  # type: ignore[call-arg]
+    project = BaseProject()
     project.run(quiet, replay)
     project.render(force)
 
diff --git a/src/dipdup/config.py b/src/dipdup/config.py
@@ -1767,9 +1767,8 @@ def _resolve_index_subscriptions(self, index_config: IndexConfigU) -> None:
             index_config.subscriptions.add(HeadSubscription())
 
         elif isinstance(index_config, TokenTransferIndexConfig):
-            # NOTE: mypy fails to parse "from_" alias
             if self.advanced.merge_subscriptions:
-                index_config.subscriptions.add(TokenTransferSubscription())  # type: ignore[call-arg]
+                index_config.subscriptions.add(TokenTransferSubscription())
             else:
                 for handler_config in index_config.handlers:
                     contract = (
@@ -1778,8 +1777,11 @@ def _resolve_index_subscriptions(self, index_config: IndexConfigU) -> None:
                     from_ = handler_config.from_.address if isinstance(handler_config.from_, ContractConfig) else None
                     to = handler_config.to.address if isinstance(handler_config.to, ContractConfig) else None
                     index_config.subscriptions.add(
-                        TokenTransferSubscription(  # type: ignore[call-arg]
-                            contract=contract, from_=from_, to=to, token_id=handler_config.token_id
+                        TokenTransferSubscription(
+                            contract=contract,
+                            from_=from_,  # type: ignore[call-arg]
+                            to=to,
+                            token_id=handler_config.token_id,
                         )
                     )
 
diff --git a/src/dipdup/datasources/tzkt/models.py b/src/dipdup/datasources/tzkt/models.py
@@ -84,7 +84,7 @@ class TokenTransferSubscription(Subscription):
     method: Literal['SubscribeToTokenTransfers'] = 'SubscribeToTokenTransfers'
     contract: str | None = None
     token_id: int | None = None
-    from_: str | None = Field(None, alias='from')
+    from_: str | None = Field(default=None, alias='from')
     to: str | None = None
 
     def get_request(self) -> list[dict[str, Any]]:
diff --git a/src/dipdup/transactions.py b/src/dipdup/transactions.py
@@ -54,7 +54,7 @@ async def in_transaction(
 
                 if level and index and self._depth:
                     if not sync_level or sync_level - level <= self._depth:
-                        self._transaction = dipdup.models.VersionedTransaction(  # type: ignore[misc]
+                        self._transaction = dipdup.models.VersionedTransaction(
                             level,
                             index,
                             self._immune_tables,
diff --git a/tests/test_hasura.py b/tests/test_hasura.py
@@ -22,7 +22,7 @@
 from dipdup.project import BaseProject
 from dipdup.utils.database import tortoise_wrapper
 
-project_defaults = BaseProject().get_defaults()  # type: ignore[call-arg]
+project_defaults = BaseProject().get_defaults()
 
 
 def get_docker_client() -> DockerClient:
@@ -127,8 +127,8 @@ async def version_response(request: web.Request) -> web.Response:
     fake_client: TestClient = await aiohttp_client(fake_api)
 
     fake_client_url = f'http://{fake_client.server.host}:{fake_client.server.port}'
-    hasura_config = HasuraConfig(fake_client_url)  # type: ignore[misc]
-    postgres_config = PostgresDatabaseConfig('postgres', 'localhost')  # type: ignore[misc]
+    hasura_config = HasuraConfig(fake_client_url)
+    postgres_config = PostgresDatabaseConfig('postgres', 'localhost')
 
     hasura_gateway = HasuraGateway('demo_nft_marketplace', hasura_config, postgres_config)
 
diff --git a/tests/test_index/test_operation.py b/tests/test_index/test_operation.py
@@ -46,7 +46,7 @@ async def test_get_origination_filters(
     index_config: OperationIndexConfig,
 ) -> None:
     index_config.handlers = (
-        OperationHandlerConfig(  # type: ignore[misc]
+        OperationHandlerConfig(
             'address_origination',
             (
                 OperationHandlerOriginationPatternConfig(
@@ -60,7 +60,7 @@ async def test_get_origination_filters(
     assert not hashes
 
     index_config.handlers = (
-        OperationHandlerConfig(  # type: ignore[misc]
+        OperationHandlerConfig(
             'hash_origination',
             (
                 OperationHandlerOriginationPatternConfig(
@@ -74,7 +74,7 @@ async def test_get_origination_filters(
     assert hashes == {-1585533315}
 
     index_config.handlers = (
-        OperationHandlerConfig(  # type: ignore[misc]
+        OperationHandlerConfig(
             'hash_address_origination',
             (
                 OperationHandlerOriginationPatternConfig(
@@ -88,7 +88,7 @@ async def test_get_origination_filters(
     assert hashes == {-680664524}
 
     index_config.handlers = (
-        OperationHandlerConfig(  # type: ignore[misc]
+        OperationHandlerConfig(
             'address_source',
             (
                 OperationHandlerOriginationPatternConfig(
