From c536dab9bf50731931856efcd41a39288cd16413 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Sun, 17 Nov 2024 04:55:07 +0900 Subject: [PATCH] Sort keys in `toml` files (#427) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- pyproject.toml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d1182a73..b4f85d86 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -78,7 +78,7 @@ repos: hooks: - id: taplo-format # See options: https://taplo.tamasfe.dev/configuration/formatter-options.html - args: [--option, "reorder_arrays=true"] + args: [--option, "reorder_arrays=true", --option, "reorder_keys=true"] - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 hooks: diff --git a/pyproject.toml b/pyproject.toml index d275ea9d..dcf31b1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,5 @@ [build-system] +build-backend = 'setuptools.build_meta' requires = [ 'gmsh<4.12.3', 'meshio<5.3.6', @@ -8,11 +9,8 @@ requires = [ 'setuptools<69.0.4', 'shapely<2.0.6', ] -build-backend = 'setuptools.build_meta' [project] -name = "scikit-gmsh" -dynamic = ["readme", "version"] dependencies = [ 'gmsh<4.12.3', 'meshio<5.3.6', @@ -21,10 +19,11 @@ dependencies = [ 'scooby<0.9.3', 'shapely<2.0.6', ] +dynamic = ["readme", "version"] +name = "scikit-gmsh" requires-python = '>=3.9' [project.optional-dependencies] -test = ['pytest==8.0.0'] docs = [ 'myst-parser==4.0.0', 'sphinx-book-theme==1.1.3', @@ -34,27 +33,28 @@ docs = [ 'sphinx-toolbox==3.8.0', 'sphinx==8.0.2', ] +test = ['pytest==8.0.0'] [tool.mypy] +enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"] ignore_missing_imports = true strict = true warn_unreachable = true -enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"] [tool.poetry] -name = "scikit-gmsh" -readme = "README.md" authors = ["Tetsuo Koyama"] description = "PyVista accessors for Gmsh to generate 3D finite element mesh" +name = "scikit-gmsh" +readme = "README.md" version = "0.0.0" [tool.pytest.ini_options] -minversion = "6.0" addopts = ["--showlocals", "--strict-config", "--strict-markers", "-ra"] -xfail_strict = true filterwarnings = ["error", 'ignore::DeprecationWarning'] log_cli_level = "info" +minversion = "6.0" testpaths = ["tests"] +xfail_strict = true [tool.ruff] line-length = 150 @@ -63,23 +63,23 @@ line-length = 150 docstring-code-format = true [tool.ruff.lint] -select = ["ALL"] ignore = ["COM812", "D203", "D212", "ISC001"] +select = ["ALL"] [tool.ruff.lint.isort] -force-sort-within-sections = true combine-as-imports = true -required-imports = ["from __future__ import annotations"] force-single-line = true +force-sort-within-sections = true +required-imports = ["from __future__ import annotations"] [tool.ruff.lint.per-file-ignores] "docs/**" = ["INP001"] -"tests/**" = ["INP001", "S101"] "examples/**" = ["D205", "D400", "D415", "INP001", "T201"] +"tests/**" = ["INP001", "S101"] [tool.ruff.lint.pyupgrade] keep-runtime-typing = true [tool.setuptools.dynamic] -version = { attr = 'skgmsh.__version__' } readme = { file = "README.md", content-type = "text/markdown" } +version = { attr = 'skgmsh.__version__' }