third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-15 10:01:46 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use tomllib/tomli/tomli-w instead of toml

Browse source 
toml has issue parsing newer toml files, and most of python
ecosystem moved to tomllib (builtin in python 3.11) with tomli for
backward support, with tomli-w used for writing. Upstream of toml is
also less active.

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
Arthur Zamarin 2022-10-28 09:28:54 +03:00
parent 5c9e844104
commit 7acefc3d39
No known key found for this signature in database
GPG key ID: 02A0AF503D120504
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pre_commit/languages/rust.py
View file

@ -11,7 +11,11 @@ import urllib.request
from typing import Generator from typing import Generator
from typing import Sequence from typing import Sequence
import toml if sys.version_info >= (3, 11):
import tomllib
else:
import tomli as tomllib
import tomli_w
import pre_commit.constants as C import pre_commit.constants as C
from pre_commit import parse_shebang from pre_commit import parse_shebang
@ -85,14 +89,14 @@ def _add_dependencies(
cargo_toml_path: str, cargo_toml_path: str,
additional_dependencies: set[str], additional_dependencies: set[str],
) -> None: ) -> None:
with open(cargo_toml_path, 'r+') as f: with open(cargo_toml_path, 'rb+') as f:
cargo_toml = toml.load(f) cargo_toml = tomllib.load(f)
cargo_toml.setdefault('dependencies', {}) cargo_toml.setdefault('dependencies', {})
for dep in additional_dependencies: for dep in additional_dependencies:
name, _, spec = dep.partition(':') name, _, spec = dep.partition(':')
cargo_toml['dependencies'][name] = spec or '*' cargo_toml['dependencies'][name] = spec or '*'
f.seek(0) f.seek(0)
toml.dump(cargo_toml, f) tomli_w.dump(cargo_toml, f)
f.truncate() f.truncate()

3
setup.cfg
View file

@ -23,7 +23,8 @@ install_requires =
identify>=1.0.0 identify>=1.0.0
nodeenv>=0.11.1 nodeenv>=0.11.1
pyyaml>=5.1 pyyaml>=5.1
toml tomli-w
tomli;python_version<"3.11"
virtualenv>=20.10.0 virtualenv>=20.10.0
importlib-metadata;python_version<"3.8" importlib-metadata;python_version<"3.8"
python_requires = >=3.7 python_requires = >=3.7