From e765aad0d79278198a6aed8aa2f19332a7b9a03e Mon Sep 17 00:00:00 2001 From: "Adam J. Jackson" Date: Thu, 12 Dec 2024 16:02:38 +0000 Subject: [PATCH 1/3] Update CHANGELOG --- CHANGELOG.rst | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ab434d6f8..b4950c8f9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,15 @@ -`Unreleased `_ -------------------------------------------------------------------------------- +`Unreleased `_ +------------------------------------------------------------------------------------- + + +`v1.4.0.post1 `_ +----------------------------------------------------------------------------------------- + +This post-release makes some changes to the source-distribution build process: +- A bug is fixed in the version-numbering script; this particularly affected Windows +- A copies of the unit tests and documentation were mistakenly included + in tarballs, making them excessively large. This is no longer present. + - Bug fixes From 28915e862add0c5fdbaf3c735be9779a76bc5545 Mon Sep 17 00:00:00 2001 From: "Adam J. Jackson" Date: Thu, 12 Dec 2024 16:22:44 +0000 Subject: [PATCH 2/3] Write version _number_ to CITATION.cff While the version is generally represented as e.g. v1.4.0.post1, in CITATION.cff the usual style is to omit the "v" and our existing release.py script assumes this. Solve the problem by tweaking the version-number-writing action. --- .github/workflows/set_version.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/set_version.yml b/.github/workflows/set_version.yml index 5bbf42c24..2e734e9b5 100644 --- a/.github/workflows/set_version.yml +++ b/.github/workflows/set_version.yml @@ -23,11 +23,13 @@ jobs: import os from packaging.version import Version - version_string = 'v' + str(Version("${{ inputs.version }}")) + version_number = str(Version("${{ inputs.version }}")) + version_string = 'v' + version_number print(f"Normalised version string: {version_string}") with open(os.environ["GITHUB_ENV"], "a") as github_env: + print(f"VERSION_NUMBER={version_number}", file=github_env) print(f"VERSION_STRING={version_string}", file=github_env) - uses: actions/checkout@v4 @@ -45,7 +47,7 @@ jobs: - name: "Update CITATION.cff" shell: bash -l {0} run: | - sed -i "s/^version:\ .*/version: ${VERSION_STRING}/" CITATION.cff + sed -i "s/^version:\ .*/version: ${VERSION_NUMBER}/" CITATION.cff sed -i "s/^date-released:\ .*/date-released: $(date -I)/" CITATION.cff - name: "Create commit" From b0f81b9d5dc4d74ca8d4e3d36e6f13468cc98596 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:25:28 +0000 Subject: [PATCH 3/3] Set version number --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 48038b25b..547771aa0 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -33,7 +33,7 @@ authors: given-names: "Jacob S." title: "Euphonic" doi: 10.5286/SOFTWARE/EUPHONIC -version: v1.4.0.post1 +version: 1.4.0.post1 date-released: 2024-12-12 license: GPL-3.0-only repository-code: https://github.com/pace-neutrons/Euphonic