Merge remote-tracking branch 'origin/main' into refactor/project_rest…

…ruct_phase2

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
           - flake8-comprehensions
           - flake8-simplify
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "1.8.0"
+    rev: "2.1.3"
     hooks:
       - id: pyproject-fmt
         # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
@@ -39,7 +39,7 @@ repos:
   #       additional_dependencies:
   #         - tomli
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.40.0
+    rev: v0.41.0
     hooks:
       - id: markdownlint
         args: ["-c", ".markdownlint.yaml", "--fix"]

pyproject.toml

@@ -25,10 +25,10 @@ dynamic = [
 ]
 dependencies = [
   "aiofiles==22.1",
-  "aiohttp<3.10.0,>=3.9.5",
-  "cryptography<43.0.0,>=42.0.4",
-  "grpcio<1.54.0,>=1.53.2",
-  "protobuf<4.22.0,>=4.21.12",
+  "aiohttp<3.10,>=3.9.5",
+  "cryptography<43,>=42.0.4",
+  "grpcio<1.54,>=1.53.2",
+  "protobuf<4.22,>=4.21.12",
   "pydantic==2.7",
   "pydantic-settings==2.2.1",
   "pyOpenSSL==24.1",
@@ -39,8 +39,7 @@ dependencies = [
   "uvicorn[standard]==0.20",
   "zstandard==0.18",
 ]
-[project.optional-dependencies]
-dev = [
+optional-dependencies.dev = [
   "black",
   "coverage",
   "flake8",
@@ -50,8 +49,7 @@ dev = [
   "pytest-mock==3.8.2",
   "requests-mock",
 ]
-[project.urls]
-Source = "https://github.com/tier4/ota-client"
+urls.Source = "https://github.com/tier4/ota-client"
 
 [tool.hatch.version]
 source = "vcs"
@@ -69,18 +67,25 @@ sources = ["src"]
 
 [tool.hatch.envs.dev]
 type = "virtual"
-features = ["dev"]
+features = [
+  "dev",
+]
 
 [tool.black]
 line-length = 88
-target-version = ['py38']
+target-version = [
+  'py38',
+]
 extend-exclude = '''(
   ^.*(_pb2.pyi?|_pb2_grpc.pyi?)$
 )'''
 
 [tool.isort]
 profile = "black"
-extend_skip_glob = ["*_pb2.py*", "_pb2_grpc.py*"]
+extend_skip_glob = [
+  "*_pb2.py*",
+  "_pb2_grpc.py*",
+]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
@@ -96,7 +101,10 @@ relative_files = true
 source = ["otaclient", "otaclient_api", "otaclient_common", "ota_metadata", "ota_proxy"]
 
 [tool.coverage.report]
-omit = ["**/*_pb2.py*", "**/*_pb2_grpc.py*"]
+omit = [
+  "**/*_pb2.py*",
+  "**/*_pb2_grpc.py*",
+]
 exclude_also = [
   "def __repr__",
   "if __name__ == .__main__.:",
@@ -108,6 +116,11 @@ skip_empty = true
 skip_covered = true
 
 [tool.pyright]
-exclude = ["**/__pycache__"]
-ignore = ["**/*_pb2.py*", "**/*_pb2_grpc.py*"]
+exclude = [
+  "**/__pycache__",
+]
+ignore = [
+  "**/*_pb2.py*",
+  "**/*_pb2_grpc.py*",
+]
 pythonVersion = "3.8"