From f332d7908a2bc049954d9de29f3e26f2fee61f04 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 10 Jan 2025 07:27:37 +0000 Subject: [PATCH 1/2] switch to tomli for toml fallback --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aef996c..d2dbe1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ packaging setuptools -toml>=0.10.2; python_version<"3.11" +tomli>=2.0.1; python_version<"3.11" From 623256e0dc74979083103b514f699752f53d102b Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 10 Jan 2025 07:33:57 +0000 Subject: [PATCH 2/2] use tomli in python code --- setuptools_git_versioning.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setuptools_git_versioning.py b/setuptools_git_versioning.py index 1447bba..7a4383b 100644 --- a/setuptools_git_versioning.py +++ b/setuptools_git_versioning.py @@ -181,9 +181,10 @@ def _read_toml(name_or_path: str | os.PathLike = "pyproject.toml", root: str | o with file_path.open("rb") as file: parsed_file = tomllib.load(file) except (ImportError, NameError): - import toml # type: ignore[no-redef] + import tomli - parsed_file = toml.load(file_path) + with file_path.open("rb") as file: + parsed_file = tomli.load(file) result = parsed_file.get("tool", {}).get("setuptools-git-versioning", None) if result: