From e80e425f4e0cf97e9022ba24c0d454dd323485cd Mon Sep 17 00:00:00 2001 From: aechxiii Date: Thu, 20 Aug 2026 10:25:39 +0200 Subject: [PATCH 1/2] Fix release verification on Windows checkouts --- scripts/verify-release.ps1 | 2 +- tests/test_verify_release.py | 67 ++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 tests/test_verify_release.py diff --git a/scripts/verify-release.ps1 b/scripts/verify-release.ps1 index 13e7be4..c25ce23 100644 --- a/scripts/verify-release.ps1 +++ b/scripts/verify-release.ps1 @@ -43,7 +43,7 @@ if ($Version -and $actualVersion -ne $Version) { } $changelog = Get-Content -LiteralPath "CHANGELOG.md" -Raw -if ($changelog -notmatch "(?m)^## \[$([regex]::Escape($actualVersion))\] - \d{4}-\d{2}-\d{2}$") { +if ($changelog -notmatch "(?m)^## \[$([regex]::Escape($actualVersion))\] - \d{4}-\d{2}-\d{2}\r?$") { throw "CHANGELOG.md has no dated section for $actualVersion." } if (-not (Test-Path -LiteralPath "requirements-lock.txt")) { diff --git a/tests/test_verify_release.py b/tests/test_verify_release.py new file mode 100644 index 0000000..e6986df --- /dev/null +++ b/tests/test_verify_release.py @@ -0,0 +1,67 @@ +"""Integration tests for the release metadata verifier.""" + +from __future__ import annotations + +import shutil +import subprocess +from pathlib import Path + +import pytest + + +REPO_ROOT = Path(__file__).resolve().parents[1] + + +def test_verify_release_accepts_crlf_changelog(tmp_path: Path) -> None: + shell = shutil.which("pwsh") or shutil.which("powershell") + if shell is None: + pytest.skip("PowerShell is required to run the release verifier") + + (tmp_path / "scripts").mkdir() + (tmp_path / "velo").mkdir() + (tmp_path / "installer").mkdir() + shutil.copy2( + REPO_ROOT / "scripts" / "verify-release.ps1", + tmp_path / "scripts" / "verify-release.ps1", + ) + (tmp_path / "pyproject.toml").write_text( + '[project]\nversion = "2.3.1"\n', encoding="utf-8" + ) + (tmp_path / "velo" / "__init__.py").write_text( + '__version__ = "2.3.1"\n', encoding="utf-8" + ) + (tmp_path / "velo" / "defaults.py").write_text( + 'APP_VERSION = "2.3.1"\n', encoding="utf-8" + ) + (tmp_path / "installer" / "Velo.iss").write_text( + '#define AppVersion "2.3.1"\n', encoding="utf-8" + ) + (tmp_path / "CHANGELOG.md").write_bytes( + b"# Changelog\r\n\r\n## [2.3.1] - 2026-08-20\r\n" + ) + (tmp_path / "requirements-lock.txt").write_text("", encoding="utf-8") + subprocess.run( + ["git", "init", "--quiet"], + cwd=tmp_path, + check=True, + capture_output=True, + text=True, + ) + + result = subprocess.run( + [ + shell, + "-NoProfile", + "-ExecutionPolicy", + "Bypass", + "-File", + str(tmp_path / "scripts" / "verify-release.ps1"), + "-Version", + "2.3.1", + ], + cwd=tmp_path, + capture_output=True, + text=True, + ) + + assert result.returncode == 0, result.stdout + result.stderr From 9e8a2687ab3f46af4c12a81b9ba822e441650819 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2026 09:31:33 +0000 Subject: [PATCH 2/2] Bump yarl from 1.22.0 to 1.24.5 Bumps [yarl](https://github.com/aio-libs/yarl) from 1.22.0 to 1.24.5. - [Release notes](https://github.com/aio-libs/yarl/releases) - [Changelog](https://github.com/aio-libs/yarl/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/yarl/compare/v1.22.0...v1.24.5) --- updated-dependencies: - dependency-name: yarl dependency-version: 1.24.5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-lock.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-lock.txt b/requirements-lock.txt index dcd062b..712f9cc 100644 --- a/requirements-lock.txt +++ b/requirements-lock.txt @@ -20,4 +20,4 @@ pywebview==6.2.1 pywin32==312; sys_platform == "win32" six==1.17.0 typing_extensions==4.16.0 -yarl==1.22.0 +yarl==1.24.5