diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | pyproject.toml | 2 | ||||
| -rw-r--r-- | taskipy/pyproject.py | 9 | ||||
| -rw-r--r-- | uv.lock | 6 |
4 files changed, 15 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 17b9319..b428c2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Removed `<7` version constraint for `psutil`. +- Python's standard library `tomllib` is now used on Python 3.11+ and `tomli` is + only installed on < Python 3.11. + +### Removed + +- `<7` version constraint for `psutil`. ## [1.15.1] - 2026-03-19 diff --git a/pyproject.toml b/pyproject.toml index d2d9956..a47b822 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] requires-python = ">=3.6" dependencies = [ - "tomli>=2.0.1; python_version >= '3.7'", + "tomli>=2.0.1; python_version >= '3.7' and python_version < '3.11'", "tomli>=1.2.3; python_version == '3.6'", "psutil>=5.7.2", "mslex>=1.1.0; sys_platform == 'win32'", diff --git a/taskipy/pyproject.py b/taskipy/pyproject.py index 74e7624..f58e9a4 100644 --- a/taskipy/pyproject.py +++ b/taskipy/pyproject.py @@ -1,7 +1,10 @@ from pathlib import Path from typing import Any, Dict, MutableMapping, Optional, Union -import tomli +try: + import tomllib +except ImportError: + import tomli as tomllib from taskipy.exceptions import ( InvalidRunnerTypeError, @@ -92,10 +95,10 @@ class PyProject: file_path = Path(file_path).resolve() with open(file_path, 'rb') as file: - return tomli.load(file) + return tomllib.load(file) except FileNotFoundError: raise MissingPyProjectFileError() - except tomli.TOMLDecodeError as e: + except tomllib.TOMLDecodeError as e: raise MalformedPyProjectError(reason=str(e)) @staticmethod @@ -953,7 +953,7 @@ dependencies = [ { name = "psutil" }, { name = "tomli", version = "1.2.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.7'" }, { name = "tomli", version = "2.0.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version == '3.7.*'" }, - { name = "tomli", version = "2.4.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.8'" }, + { name = "tomli", version = "2.4.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.8' and python_full_version < '3.11'" }, ] [package.dev-dependencies] @@ -976,7 +976,7 @@ requires-dist = [ { name = "mslex", marker = "sys_platform == 'win32'", specifier = ">=1.1.0" }, { name = "psutil", specifier = ">=5.7.2" }, { name = "tomli", marker = "python_full_version == '3.6.*'", specifier = ">=1.2.3" }, - { name = "tomli", marker = "python_full_version >= '3.7'", specifier = ">=2.0.1" }, + { name = "tomli", marker = "python_full_version >= '3.7' and python_full_version < '3.11'", specifier = ">=2.0.1" }, ] [package.metadata.requires-dev] @@ -1030,8 +1030,6 @@ name = "tomli" version = "2.4.0" source = { registry = "https://pypi.org/simple" } resolution-markers = [ - "python_full_version >= '3.12'", - "python_full_version == '3.11.*'", "python_full_version == '3.10.*'", "python_full_version == '3.9.*'", "python_full_version == '3.8.*'", |