chore: replace taplo with tombi

.pre-commit-config.yaml

@@ -74,6 +74,12 @@ repos:
             mascot\.svg
           )$
 
+  - repo: https://github.com/tombi-toml/tombi-pre-commit
+    rev: v0.9.3
+    hooks:
+      - id: tombi-format
+      - id: tombi-lint
+
   - repo: local
     hooks:
       # Mypy is difficult to run pre-commit's isolated environment as it needs

.tombi.toml

@@ -0,0 +1,5 @@
+toml-version = "v1.1.0"
+
+[format]
+  [format.rules]
+  indent-sub-tables = true

.vscode/extensions.json

@@ -11,7 +11,7 @@
     "ms-python.mypy-type-checker",
     "ms-python.python",
     "redhat.vscode-yaml",
-    "tamasfe.even-better-toml",
-    "yzhang.markdown-all-in-one"
+    "yzhang.markdown-all-in-one",
+    "tombi-toml.tombi"
   ]
 }

committed.toml

@@ -2,11 +2,12 @@
 ## Configuration for committed
 ##
 ## See <https://github.com/crate-ci/committed/blob/master/docs/reference.md>
+
 style = "conventional"
 
-line_length         = 80
-merge_commit        = false
-no_fixup            = false
+line_length = 80
+merge_commit = false
+no_fixup = false
 subject_capitalized = false
 
 allowed_types = [

docs/scripts/.ruff.toml

@@ -1,7 +1,8 @@
 #:schema https://www.schemastore.org/ruff.json
+
 extend = "../../pyproject.toml"
 
 [lint]
 ignore = [
-  "INP001", # Forbid implicit namespaces
+  "INP001",  # Forbid implicit namespaces
 ]

examples/catalog/pyproject.toml

@@ -1,6 +1,7 @@
 #:schema https://www.schemastore.org/pyproject.toml
+
 [project]
-name    = "pact-python-catalog"
+name = "pact-python-catalog"
 version = "1.0.0"
 
 dependencies = [
@@ -15,15 +16,16 @@ requires-python = ">=3.10"
 [dependency-groups]
 test = ["pact-python", "pytest~=9.0", "uvicorn~=0.30"]
 
-[tool.uv.sources]
-pact-python = { path = "../../" }
+[tool]
+  [tool.uv.sources]
+  pact-python = { path = "../../" }
 
-[tool.ruff]
-extend = "../../pyproject.toml"
+  [tool.ruff]
+  extend = "../../pyproject.toml"
 
-[tool.pytest]
-addopts = ["--import-mode=importlib"]
+  [tool.pytest]
+  addopts = ["--import-mode=importlib"]
 
-log_date_format = "%H:%M:%S"
-log_format      = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
-log_level       = "NOTSET"
+  log_date_format = "%H:%M:%S"
+  log_format = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
+  log_level = "NOTSET"

examples/http/aiohttp_and_flask/pyproject.toml

@@ -1,27 +1,29 @@
 #:schema https://www.schemastore.org/pyproject.json
+
 [project]
 name = "example-aiohttp-and-flask"
 
 description = "Example of using an aiohttp client and Flask server with Pact Python"
 
-dependencies    = ["aiohttp~=3.0", "flask~=3.0", "typing-extensions~=4.0"]
+version = "1.0.0"
 requires-python = ">=3.10"
-version         = "1.0.0"
+dependencies = ["aiohttp~=3.0", "flask~=3.0", "typing-extensions~=4.0"]
 
 [dependency-groups]
-test = ["pact-python", "pytest-asyncio~=1.0", "pytest~=9.0"]
+test = ["pact-python", "pytest~=9.0", "pytest-asyncio~=1.0"]
 
-[tool.uv.sources]
-pact-python = { path = "../../../" }
+[tool]
+  [tool.pytest]
+  addopts = ["--import-mode=importlib"]
 
-[tool.ruff]
-extend = "../../../pyproject.toml"
+  asyncio_default_fixture_loop_scope = "session"
 
-[tool.pytest]
-addopts = ["--import-mode=importlib"]
+  log_date_format = "%H:%M:%S"
+  log_format = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
+  log_level = "NOTSET"
 
-asyncio_default_fixture_loop_scope = "session"
+  [tool.ruff]
+  extend = "../../../pyproject.toml"
 
-log_date_format = "%H:%M:%S"
-log_format      = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
-log_level       = "NOTSET"
+  [tool.uv.sources]
+  pact-python = { path = "../../../" }

examples/http/requests_and_fastapi/pyproject.toml

@@ -1,28 +1,29 @@
 #:schema https://www.schemastore.org/pyproject.json
+
 [project]
 name = "example-requests-and-fastapi"
 
 description = "Example of using a requests client and FastAPI server with Pact Python"
 
-dependencies    = ["requests~=2.0", "fastapi~=0.0", "typing-extensions~=4.0"]
+version = "1.0.0"
 requires-python = ">=3.10"
-version         = "1.0.0"
+dependencies = ["fastapi~=0.0", "requests~=2.0", "typing-extensions~=4.0"]
 
 [dependency-groups]
-
 test = ["pact-python", "pytest~=9.0", "uvicorn~=0.29"]
 
-[tool.uv.sources]
-pact-python = { path = "../../../" }
+[tool]
+  [tool.pytest]
+  addopts = ["--import-mode=importlib"]
 
-[tool.ruff]
-extend = "../../../pyproject.toml"
+  asyncio_default_fixture_loop_scope = "session"
 
-[tool.pytest]
-addopts = ["--import-mode=importlib"]
+  log_date_format = "%H:%M:%S"
+  log_format = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
+  log_level = "NOTSET"
 
-asyncio_default_fixture_loop_scope = "session"
+  [tool.ruff]
+  extend = "../../../pyproject.toml"
 
-log_date_format = "%H:%M:%S"
-log_format      = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
-log_level       = "NOTSET"
+  [tool.uv.sources]
+  pact-python = { path = "../../../" }

examples/http/service_consumer_provider/pyproject.toml

@@ -1,26 +1,27 @@
 #:schema https://www.schemastore.org/pyproject.json
+
 [project]
 name = "example-service-consumer-provider"
 
 description = "Example of a service acting as both a Pact consumer and provider"
 
-dependencies    = ["fastapi~=0.0", "requests~=2.0", "typing-extensions~=4.0"]
+version = "1.0.0"
 requires-python = ">=3.10"
-version         = "1.0.0"
+dependencies = ["fastapi~=0.0", "requests~=2.0", "typing-extensions~=4.0"]
 
 [dependency-groups]
-
 test = ["pact-python", "pytest~=9.0", "uvicorn~=0.29"]
 
-[tool.uv.sources]
-pact-python = { path = "../../../" }
+[tool]
+  [tool.pytest]
+  addopts = ["--import-mode=importlib"]
 
-[tool.ruff]
-extend = "../../../pyproject.toml"
+  log_date_format = "%H:%M:%S"
+  log_format = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
+  log_level = "NOTSET"
 
-[tool.pytest]
-addopts = ["--import-mode=importlib"]
+  [tool.ruff]
+  extend = "../../../pyproject.toml"
 
-log_date_format = "%H:%M:%S"
-log_format      = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
-log_level       = "NOTSET"
+  [tool.uv.sources]
+  pact-python = { path = "../../../" }

examples/http/xml_example/pyproject.toml

@@ -1,27 +1,29 @@
 #:schema https://www.schemastore.org/pyproject.json
+
 [project]
 name = "example-xml"
 
 description = "Example of XML contract testing with Pact Python"
 
-dependencies    = ["requests~=2.0", "fastapi~=0.0", "typing-extensions~=4.0"]
+version = "1.0.0"
 requires-python = ">=3.10"
-version         = "1.0.0"
+dependencies = ["fastapi~=0.0", "requests~=2.0", "typing-extensions~=4.0"]
 
 [dependency-groups]
 test = ["pact-python", "pytest~=9.0", "uvicorn~=0.29"]
 
-[tool.uv.sources]
-pact-python = { path = "../../../" }
+[tool]
+  [tool.pytest]
+  addopts = ["--import-mode=importlib"]
 
-[tool.ruff]
-extend = "../../../pyproject.toml"
+  asyncio_default_fixture_loop_scope = "session"
 
-[tool.pytest]
-addopts = ["--import-mode=importlib"]
+  log_date_format = "%H:%M:%S"
+  log_format = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
+  log_level = "NOTSET"
 
-asyncio_default_fixture_loop_scope = "session"
+  [tool.ruff]
+  extend = "../../../pyproject.toml"
 
-log_date_format = "%H:%M:%S"
-log_format      = "%(asctime)s.%(msecs)03d [%(levelname)-8s] %(name)s: %(message)s"
-log_level       = "NOTSET"
+  [tool.uv.sources]
+  pact-python = { path = "../../../" }