Do not crash on out of order tables (#96)

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
  hooks:
  - id: ssort
  - repo: https://github.com/asottile/pyupgrade
- rev: v3.3.2
+ rev: v3.4.0
  hooks:
  - id: pyupgrade
  args: [ "--py37-plus" ]
@@ -43,6 +43,7 @@ repos:
  rev: "0.11.1"
  hooks:
  - id: pyproject-fmt
+ additional_dependencies: [ tox>=4.5.1 ]
  - repo: https://github.com/PyCQA/flake8
  rev: 6.0.0
  hooks:

pyproject.toml

@@ -2,7 +2,7 @@
 build-backend = "hatchling.build"
 requires = [
  "hatch-vcs>=0.3",
- "hatchling>=1.14",
+ "hatchling>=1.14.1",
 ]
 
 [project]
@@ -26,19 +26,20 @@ classifiers = [
  "Programming Language :: Python :: 3.9",
  "Programming Language :: Python :: 3.10",
  "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
 ]
 dynamic = [
  "version",
 ]
 dependencies = [
  "natsort>=8.3.1",
  "packaging>=23.1",
- "tomlkit>=0.11.7",
+ "tomlkit>=0.11.8",
  'typing-extensions>=4.5; python_version < "3.8"',
 ]
 optional-dependencies.docs = [
  "furo>=2023.3.27",
- "sphinx>=6.1.3",
+ "sphinx>=6.2.1",
  "sphinx-argparse-cli>=1.11",
  "sphinx-autodoc-typehints!=1.23.4,>=1.23",
  "sphinx-copybutton>=0.5.2",

src/pyproject_fmt/formatter/tools.py

@@ -17,6 +17,7 @@ def fmt_tools(parsed: TOMLDocument, conf: Config) -> None: # noqa: U100
  table = tools[tool]
  ensure_newline_at_end(cast(Table, table))
  order = [
+ "poetry",
  "setuptools",
  "setuptools_scm",
  "hatch",

src/pyproject_fmt/formatter/util.py

@@ -135,6 +135,8 @@ def ensure_newline_at_end(body: Table) -> None:
  # coverage has a bug on python < 3.10, seeing this line as uncovered
  # https://github.com/nedbat/coveragepy/issues/1480
  break
+ if isinstance(body, OutOfOrderTableProxy):
+ return
  whitespace = Whitespace("\n")
  insert_body = content.value.body
  if insert_body and isinstance(insert_body[-1][1], Whitespace):

tests/formatter/test_tools.py

@@ -6,8 +6,12 @@
 
 def test_tools_ordering(fmt: Fmt) -> None:
  content = """
+ [tool.poetry]
+ name = "a"
  [tool.coverage]
  a = 0
+ [tool.poetry.scripts]
+ version = "1"
  [tool.pytest]
  a = 0
  [tool.black]
@@ -24,6 +28,10 @@ def test_tools_ordering(fmt: Fmt) -> None:
 
  """
  expected = """
+ [tool.poetry]
+ name = "a"
+ [tool.poetry.scripts]
+ version = "1"
  [tool.setuptools]
  a.b = 0