From 0f2b7a588a93abb3c66df3da60d96a1b39b6c8ff Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:13:23 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: 76e47323a83cd9795e4ff9a1de1c0d2eef610f17 → 7445ed19e95ffaa6aad0d9bd4123025f7039511a](https://github.com/astral-sh/ruff-pre-commit/compare/76e47323a83cd9795e4ff9a1de1c0d2eef610f17...7445ed19e95ffaa6aad0d9bd4123025f7039511a) - [github.com/astral-sh/ruff-pre-commit: 76e47323a83cd9795e4ff9a1de1c0d2eef610f17 → 7445ed19e95ffaa6aad0d9bd4123025f7039511a](https://github.com/astral-sh/ruff-pre-commit/compare/76e47323a83cd9795e4ff9a1de1c0d2eef610f17...7445ed19e95ffaa6aad0d9bd4123025f7039511a) - [github.com/rstcheck/rstcheck: f30c4d170a36ea3812bceb5f33004afc213bd797 → 27258fde1ee7d3b1e6a7bbc58f4c7b1dd0e719e5](https://github.com/rstcheck/rstcheck/compare/f30c4d170a36ea3812bceb5f33004afc213bd797...27258fde1ee7d3b1e6a7bbc58f4c7b1dd0e719e5) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b23c1f..c906f43 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -49,7 +49,7 @@ repos: # ruff - python linter with fixing ability - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 76e47323a83cd9795e4ff9a1de1c0d2eef610f17 # frozen: v0.11.11 + rev: 7445ed19e95ffaa6aad0d9bd4123025f7039511a # frozen: v0.12.1 hooks: - id: ruff name: ruff (fix) @@ -145,7 +145,7 @@ repos: # ruff - python linter with fixing ability - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 76e47323a83cd9795e4ff9a1de1c0d2eef610f17 # frozen: v0.11.11 + rev: 7445ed19e95ffaa6aad0d9bd4123025f7039511a # frozen: v0.12.1 hooks: - id: ruff name: ruff (lint) @@ -205,7 +205,7 @@ repos: # rstcheck - rst file checker - repo: https://github.com/rstcheck/rstcheck - rev: f30c4d170a36ea3812bceb5f33004afc213bd797 # frozen: v6.2.4 + rev: 27258fde1ee7d3b1e6a7bbc58f4c7b1dd0e719e5 # frozen: v6.2.5 hooks: - id: rstcheck additional_dependencies: [sphinx] From 18a7a506b463f9ec18a0e894fc565207cece8040 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:13:36 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .pre-commit-config.yaml | 6 +++--- prep_release.py | 4 ++-- src/rstcheck_core/config.py | 40 ++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c906f43..a0b0c28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -49,7 +49,7 @@ repos: # ruff - python linter with fixing ability - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 7445ed19e95ffaa6aad0d9bd4123025f7039511a # frozen: v0.12.1 + rev: 7445ed19e95ffaa6aad0d9bd4123025f7039511a # frozen: v0.12.1 hooks: - id: ruff name: ruff (fix) @@ -145,7 +145,7 @@ repos: # ruff - python linter with fixing ability - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 7445ed19e95ffaa6aad0d9bd4123025f7039511a # frozen: v0.12.1 + rev: 7445ed19e95ffaa6aad0d9bd4123025f7039511a # frozen: v0.12.1 hooks: - id: ruff name: ruff (lint) @@ -205,7 +205,7 @@ repos: # rstcheck - rst file checker - repo: https://github.com/rstcheck/rstcheck - rev: 27258fde1ee7d3b1e6a7bbc58f4c7b1dd0e719e5 # frozen: v6.2.5 + rev: 27258fde1ee7d3b1e6a7bbc58f4c7b1dd0e719e5 # frozen: v6.2.5 hooks: - id: rstcheck additional_dependencies: [sphinx] diff --git a/prep_release.py b/prep_release.py index fd14a40..1700042 100644 --- a/prep_release.py +++ b/prep_release.py @@ -140,14 +140,14 @@ def _main() -> int: if args.first_release: release_version = "v1.0.0" #: Get first commit - current_version = subprocess.run( # noqa: S603 + current_version = subprocess.run( ["git", "rev-list", "--max-parents=0", "HEAD"], # noqa: S607 check=True, capture_output=True, ).stdout.decode()[0:7] else: git_tags = ( - subprocess.run( # noqa: S603 + subprocess.run( ["git", "tag", "--list"], # noqa: S607 check=True, capture_output=True, diff --git a/src/rstcheck_core/config.py b/src/rstcheck_core/config.py index eddbe72..28b1a65 100644 --- a/src/rstcheck_core/config.py +++ b/src/rstcheck_core/config.py @@ -86,12 +86,12 @@ class RstcheckConfigFile(pydantic.BaseModel): :raises pydantic.ValidationError: If setting is not parsable into correct type """ - report_level: t.Optional[ReportLevel] = None # noqa: UP007 - ignore_directives: t.Optional[t.List[str]] = None # noqa: UP007,UP006 - ignore_roles: t.Optional[t.List[str]] = None # noqa: UP007,UP006 - ignore_substitutions: t.Optional[t.List[str]] = None # noqa: UP007,UP006 - ignore_languages: t.Optional[t.List[str]] = None # noqa: UP007,UP006 - ignore_messages: t.Optional[t.Pattern[str]] = None # noqa: UP007 + report_level: ReportLevel | None = None + ignore_directives: t.List[str] | None = None # noqa: UP006 + ignore_roles: t.List[str] | None = None # noqa: UP006 + ignore_substitutions: t.List[str] | None = None # noqa: UP006 + ignore_languages: t.List[str] | None = None # noqa: UP006 + ignore_messages: t.Pattern[str] | None = None @pydantic.field_validator("report_level", mode="before") @classmethod @@ -189,9 +189,9 @@ class RstcheckConfig(RstcheckConfigFile): :raises pydantic.ValidationError: If setting is not parsable into correct type """ - config_path: t.Optional[pathlib.Path] = None # noqa: UP007 - recursive: t.Optional[bool] = None # noqa: UP007 - warn_unknown_settings: t.Optional[bool] = None # noqa: UP007 + config_path: pathlib.Path | None = None + recursive: bool | None = None + warn_unknown_settings: bool | None = None class _RstcheckConfigINIFile(pydantic.BaseModel): @@ -203,11 +203,11 @@ class _RstcheckConfigINIFile(pydantic.BaseModel): """ report_level: t.Union[str, int, None] = None # noqa: UP007 - ignore_directives: t.Optional[str] = None # noqa: UP007 - ignore_roles: t.Optional[str] = None # noqa: UP007 - ignore_substitutions: t.Optional[str] = None # noqa: UP007 - ignore_languages: t.Optional[str] = None # noqa: UP007 - ignore_messages: t.Optional[str] = None # noqa: UP007 + ignore_directives: str | None = None + ignore_roles: str | None = None + ignore_substitutions: str | None = None + ignore_languages: str | None = None + ignore_messages: str | None = None def _load_config_from_ini_file( @@ -281,10 +281,10 @@ class _RstcheckConfigTOMLFile(pydantic.BaseModel): """ report_level: t.Union[str, int, None] = None # noqa: UP007 - ignore_directives: t.Optional[t.List[str]] = None # noqa: UP006, UP007 - ignore_roles: t.Optional[t.List[str]] = None # noqa: UP006, UP007 - ignore_substitutions: t.Optional[t.List[str]] = None # noqa: UP006, UP007 - ignore_languages: t.Optional[t.List[str]] = None # noqa: UP006, UP007 + ignore_directives: t.List[str] | None = None # noqa: UP006 + ignore_roles: t.List[str] | None = None # noqa: UP006 + ignore_substitutions: t.List[str] | None = None # noqa: UP006 + ignore_languages: t.List[str] | None = None # noqa: UP006 ignore_messages: t.Union[t.List[str], str, None] = None # noqa: UP006, UP007 @@ -334,9 +334,7 @@ def _load_config_from_toml_file( with pathlib.Path(resolved_file).open("rb") as toml_file_handle: toml_dict = tomllib.load(toml_file_handle) - rstcheck_section: t.Optional[dict[str, t.Any]] = toml_dict.get("tool", {}).get( # noqa: UP007 - "rstcheck" - ) + rstcheck_section: dict[str, t.Any] | None = toml_dict.get("tool", {}).get("rstcheck") if rstcheck_section is None: if log_missing_section_as_warning: