From 260dcf09791193ed0f07f2026be0e7cb61ef370b Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Fri, 21 Feb 2025 23:20:27 +0100 Subject: [PATCH 1/2] chore: scriv collect --- CHANGELOG.md | 19 +++++++++++- ...1003_203751_ronny_fix_950_encoding_safe.md | 4 --- .../20240105_133254_subprocess_timeout_var.md | 4 --- .../20240108_134756_cli_version_file_force.md | 30 ------------------- ...0305_102047_allow_non_normalized_semver.md | 4 --- src/setuptools_scm/_file_finders/git.py | 2 +- 6 files changed, 19 insertions(+), 44 deletions(-) delete mode 100644 changelog.d/20231003_203751_ronny_fix_950_encoding_safe.md delete mode 100644 changelog.d/20240105_133254_subprocess_timeout_var.md delete mode 100644 changelog.d/20240108_134756_cli_version_file_force.md delete mode 100644 changelog.d/20240305_102047_allow_non_normalized_semver.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 01d6cb4a..5ba3260f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,21 @@ -# Unreleased + +# v8.2.0 + +## Added + +- fix #960: add a ``--force-write-version-files`` flag for the cli + +## Changed + +- fix #950: ensure to pass encodings to io usage +- fix #957 - add subprocess timeout control env var + +## Fixed + +- fix #1018: allow non-normalized versions for semver + + +# 8.1.0 ## Changed diff --git a/changelog.d/20231003_203751_ronny_fix_950_encoding_safe.md b/changelog.d/20231003_203751_ronny_fix_950_encoding_safe.md deleted file mode 100644 index 4617ee3b..00000000 --- a/changelog.d/20231003_203751_ronny_fix_950_encoding_safe.md +++ /dev/null @@ -1,4 +0,0 @@ - -### Changed - -- fix #950: ensure to pass encodings to io usage \ No newline at end of file diff --git a/changelog.d/20240105_133254_subprocess_timeout_var.md b/changelog.d/20240105_133254_subprocess_timeout_var.md deleted file mode 100644 index 78ecab27..00000000 --- a/changelog.d/20240105_133254_subprocess_timeout_var.md +++ /dev/null @@ -1,4 +0,0 @@ - -### Changed - -- fix #957 - add subprocess timeout control env var diff --git a/changelog.d/20240108_134756_cli_version_file_force.md b/changelog.d/20240108_134756_cli_version_file_force.md deleted file mode 100644 index c313c178..00000000 --- a/changelog.d/20240108_134756_cli_version_file_force.md +++ /dev/null @@ -1,30 +0,0 @@ - -### Added - -- fix #960: add a ``--force-write-version-files`` flag for the cli - ---> - - - - diff --git a/changelog.d/20240305_102047_allow_non_normalized_semver.md b/changelog.d/20240305_102047_allow_non_normalized_semver.md deleted file mode 100644 index f5d85673..00000000 --- a/changelog.d/20240305_102047_allow_non_normalized_semver.md +++ /dev/null @@ -1,4 +0,0 @@ - -### Fixed - -- fix #1018: allow non-normalized versions for semver diff --git a/src/setuptools_scm/_file_finders/git.py b/src/setuptools_scm/_file_finders/git.py index d9a64387..0eb23ced 100644 --- a/src/setuptools_scm/_file_finders/git.py +++ b/src/setuptools_scm/_file_finders/git.py @@ -72,7 +72,7 @@ def _git_ls_files_and_dirs(toplevel: str) -> tuple[set[str], set[str]]: # export-ignore git attribute cmd = ["git", "archive", "--prefix", toplevel + os.path.sep, "HEAD"] - log.info("running %s" % " ".join(str(x) for x in cmd)) + log.info("running %s", " ".join(str(x) for x in cmd)) proc = subprocess.Popen( cmd, stdout=subprocess.PIPE, cwd=toplevel, stderr=subprocess.DEVNULL ) From e554978c2fa77d187061ba2bfa2553b0a2d26a85 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Fri, 21 Feb 2025 23:28:55 +0100 Subject: [PATCH 2/2] complete changelog to reasonable accuracy for quick release --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ba3260f..0182fed7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,15 @@ - fix #950: ensure to pass encodings to io usage - fix #957 - add subprocess timeout control env var +- add sp-repo-review pre-commit hook ## Fixed - fix #1018: allow non-normalized versions for semver - +- fix #1103: respect GIT_CEILING_DIRECTORIES when trying to find git toplevels +- fix #1081: add name normalized pipx entrypoint +- fix #1080: clean pdm from PYTHONPATH to protect mercurial +- # 8.1.0