Bump to 1.6.0rc3

[forsyth2]

Bump to 1.6.0rc3

[forsyth2]

Release process notes:

Previous RC PRs:

• v1.6.0rc1
• v1.6.0rc2 -- this was made off a branch other than main.

For v.1.5.0:

• 1.5.0rc1
• 1.5.0 Production Release

Step 0: Merge the fixes

Merged #440.

For #442, we should rebase so that we're not including the commits from PR 440 in the diff.

cd ~/ez/zstash
git status
# On branch fixes-of-unified-rc5
# nothing to commit, working tree clean
git log --oneline | head -n 7
# 775cc9c Add Improv support
# 2f9cf1e Fix hsi calls in follow_symlinks.sh
# e6af592 Fix hsi calls in test_update_non_empty_hpss.bash
# 35de9d9 Bump to 1.6.0rc2
# 2aca27b Add unit tests for sanitized commands
# f916017 Sanitize environment before `hsi` subprocess calls
# ed6a77e Bump to 1.6.0rc1 (#438)
# Good, already matches https://github.com/E3SM-Project/zstash/pull/442/commits
git fetch upstream main
git rebase upstream/main
git log --oneline | head -n 7
# 6848913 Add Improv support
# b04f6ca Fix hsi calls in follow_symlinks.sh
# a0b8df3 Fix hsi calls in test_update_non_empty_hpss.bash
# b260147 Bump to 1.6.0rc2
# 4e1dad2 Isolate hsi calls (#440)
# ed6a77e Bump to 1.6.0rc1 (#438)
# 601eb4b Add Bebop support (#437)
# Good, it's updated.
git push -f upstream fixes-of-unified-rc5

Merged #442

Step 1: setup/testing

The fixes above (#440, #442) were tested extensively as part of the E3SM Unified 1.13.0rc5 testing, which included zstash v1.6.0rc2. So we can skip the testing step now.

Step 2: Bump versions

What is our new version? Nothing has been a breaking change, so we don't need to increment the major version.

https://github.com/E3SM-Project/zstash/commits/main/:

• Requires a minor version update: major performance improvement to zstash update,
• Requires a patch version update: tar deletion test, AGENTS.md, tar deletion bug fix, Python 3.14 support, Bebop support, Bump to 1.6.0rc1, Isolate HSI calls, Fixes of Unified rc5

So, we will increment the minor version. We'll go from v1.5.0 to v1.6.0.

Step 2a: Confluence

Update https://e3sm.atlassian.net/wiki/spaces/DOC/pages/129732419/Packages+in+the+E3SM+Unified+conda+environment:

• E3SM Unified 1.11.0: zstash v1.4.4
• E3SM Unified 1.11.1: zstash v1.4.4
• E3SM Unified 1.12.0: zstash v1.5.0
• E3SM Unified 1.13.0: zstash v1.6.0 (already done during rc1)

Step 2b: zstash repo

cd ~/ez/zstash
git status # Check for uncommitted changes
git fetch upstream main
git checkout -b v1.6.0rc3 upstream/main
lcrc_conda # Bash function to activate conda
conda activate zstash_main_20260406 # We just need some dev environment that has tbump in it.
tbump 1.6.0rc3 --no-tag 
# Error: Command `git push upstream main` failed -- that's only because the branch name isn't main.
git diff HEAD^ HEAD | cat
# Yes, these match up with changes in https://github.com/E3SM-Project/zstash/pull/389
git push upstream v1.6.0rc3
# Create, and add "Update version" label to, and merge https://github.com/E3SM-Project/zstash/pull/443
# Delete that branch on GitHub
git checkout main 
git fetch upstream
git reset --hard upstream/main
git log --oneline | head -n 2
# 2469f4a Bump to 1.6.0rc3 (#443)
# b985d89 Merge pull request #442 from E3SM-Project/fixes-of-unified-rc5
git tag -a v1.6.0rc3 -m "v1.6.0rc3"
# Delete the branch from the tbump step. Otherwise, the push command won't work.
git branch -D v1.6.0rc3
git push upstream v1.6.0rc3

v1.6.0rc3 now appears on Tags but not on Releases. Good, this is expected.

Step 2c: zstash-feedstock repo

Perlmutter:

cd /global/homes/f/forsyth/zstash-feedstock
curl -sL https://github.com/E3SM-Project/zstash/archive/v1.6.0rc3.tar.gz | openssl sha256
# SHA2-256(stdin)= 5b880a7a5454ed15254bb472252ae63ddf7757baabd1b8a4375e670d15e1794f
git fetch upstream dev
git checkout -b v1.6.0rc3 upstream/dev
emacs recipe/meta.yaml
# In `recipe/meta.yaml`, update the version and sha256 (and the build number if needed):
# {% set version = "1.6.0rc3" %}
# sha256: ... # The sha256 from the previous step
# number: 0 # build >>> number should always be 0

# From https://github.com/conda-forge/zppy-interfaces-feedstock/pull/5#pullrequestreview-3351366258:
# Please always check the diff between the tag you're making a package for and the previous one. Please look for changes e.g. in dev.yml

# Review:
# https://github.com/E3SM-Project/zstash/compare/v1.6.0rc2...v1.6.0rc3
# No conda/dev.yml changes to include in recipe/meta.yaml.

git add -A
git commit -m "v1.6.0rc3"
git push forsyth2 v1.6.0rc3

Created conda-forge/zstash-feedstock#27