launchpad-reviewers team mailing list archive

[Colin Watson <mp+429777@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:build-tarball-version-info-txt into launchpad:master.

Commit message:
Include version-info.txt in tarball

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/429777

e13a5160434255d831c7ed8697c6d5fe72101126 changed `scripts/update-version-info.sh` to include a `version-info.txt` file for use by Talisker, in order to support running outside a git tree.  However, I forgot to include this file in the tarballs built for use by charms, so `talisker.config.get_revision_id` ended up silently falling back to calling `python3 setup.py --version`.  On focal, this writes a deprecation warning to stderr, which confuses Talisker into trying to include that deprecation warning as part of the value of an HTTP header.

Including `version-info.txt` in the tarball is a little more efficient and avoids this problem.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:build-tarball-version-info-txt into launchpad:master.

diff --git a/utilities/build-tarball b/utilities/build-tarball
index 35e6315..22cba4a 100755
--- a/utilities/build-tarball
+++ b/utilities/build-tarball
@@ -31,6 +31,7 @@ mkdir -p "$output_dir"
     # instead, but JavaScript-enabled builds need yarn.
     find ./download-cache/dist/ -name yarn-\*.tar.gz
     echo ./version-info.py
+    echo ./version-info.txt
     find ./wheels/ -name \*.whl -print
 ) | sort >"$output_dir/.files"