Skip to content

Conversation

@forsyth2
Copy link
Collaborator

Summary

Objectives:

  • Bump to 1.5.0rc3

Select one: This pull request is...

  • a bug fix: increment the patch version
  • a small improvement: increment the minor version
  • a new feature: increment the minor version
  • an incompatible (non-backwards compatible) API change: increment the major version

Small Change

  • To merge, I will use "Squash and merge". That is, this change should be a single commit.
  • Logic: I have visually inspected the entire pull request myself.
  • Pre-commit checks: All the pre-commits checks have passed.

@forsyth2 forsyth2 self-assigned this Oct 18, 2025
@forsyth2 forsyth2 added the Update version Code specifically to update the version label Oct 18, 2025
@forsyth2 forsyth2 merged commit ce18814 into main Oct 18, 2025
5 checks passed
@forsyth2 forsyth2 deleted the v1.5.0rc3 branch October 18, 2025 00:21
@forsyth2
Copy link
Collaborator Author

zstash rc3

Release process notes:

Step 1: testing

cd ~/ez/zstash
git status
# Check for uncommitted changes
git fetch upstream
git checkout main
git reset --hard upstream/main
git log
# Last commit: Improve tests (#393)
# Good, matches https://github.com/E3SM-Project/zstash/commits/main/
# Good, hashes match
nersc_conda # Activate conda
conda clean --all --y
conda env create -f conda/dev.yml -n zstash_dev_20251017_eod
conda activate zstash_dev_20251017_eod
pre-commit run --all-files
python -m pip install .

Testing was completed as part of #393

Step 2: Bump versions

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 (We updated this when we made rc1)

Step 2b: zstash repo

git fetch upstream main
git checkout -b v1.5.0rc3 upstream/main
tbump 1.5.0rc3 --no-tag
# Makes the commit, but doesn't push because our branch name isn't `main`
# Strangely, it doesn't give a warning about that this time.
git grep -n "1\.5\.0rc3" | cat
# setup.py:5:    version="1.5.0rc3",
# tbump.toml:5:current = "1.5.0rc3"
# zstash/__init__.py:1:__version__ = "v1.5.0rc3"
#
# setup.py:5:    version="1.4.4",
# tbump.toml:5:current = "1.4.4"
# zstash/__init__.py:1:__version__ = "v1.4.4"
#
# Yes, these match up with changes in https://github.com/E3SM-Project/zstash/pull/359
git push upstream v1.5.0rc3
# Follow example of https://github.com/E3SM-Project/zstash/pull/392
# Create, add "Update version" label" to, and merge https://github.com/E3SM-Project/zstash/pull/394

git fetch upstream
git checkout main
git reset --hard upstream/main
git tag -a v1.5.0rc3 -m "v1.5.0rc3"
git branch -D v1.5.0rc3
git push upstream v1.5.0rc3

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

Step 2c: zstash-feedstock repo

cd /global/homes/f/forsyth/zstash-feedstock
curl -sL https://github.com/E3SM-Project/zstash/archive/v1.5.0rc3.tar.gz | openssl sha256
# SHA2-256(stdin)= 5f039b176f6c5a63b42b6ce330bcb7291ce3753713218bfa40edaf9a2320ef1d
git status
# Check for uncommitted changes
git fetch upstream dev
git checkout -b v1.5.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.5.0rc3" %}
# sha256: ... # The sha256 from the previous step
# number: 0 # build >>> number should always be 0
#
git add -A
git commit -m "v1.5.0rc3"
git push forsyth2 v1.5.0rc3
# Follow example of https://github.com/conda-forge/zstash-feedstock/pull/17

Created conda-forge/zstash-feedstock#18

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Update version Code specifically to update the version

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants