Skip to content

Bump to 3.3.0rc2 - #891

Merged
forsyth2 merged 1 commit into
mainfrom
v3.3.0rc2
Oct 19, 2026
Merged

forsyth2 merged 1 commit into
mainfrom
v3.3.0rc2

Conversation

@forsyth2

Copy link
Copy Markdown
Collaborator

Bump to 3.3.0rc2

@forsyth2 forsyth2 self-assigned this Oct 19, 2026
@forsyth2 forsyth2 added the Update version Code specifically to update the version label Oct 19, 2026
@forsyth2
forsyth2 merged commit 284eac4 into main Oct 19, 2026
7 checks passed
@forsyth2

Copy link
Copy Markdown
Collaborator Author

Creating zppy rc2

zppy's RC setup docs can be found here

Step 1: Testing

We'll just run the unit tests for now and then run the integration tests as part of the Unified testing.

# Set up branch
cd ~/ez/zppy
git status # Check for uncommitted changes
# nothing to commit, working tree clean
git fetch upstream main
git checkout main
git reset --hard upstream/main
# HEAD is now at e45286e8 Add snow storage, snow cover, river discharge analysis (#888)

# Good, matches https://github.com/E3SM-Project/zppy/commits/main/

# Set up conda environment
bash # Run bash so we're in an isolated subshell
lcrc_conda # Make sure conda is activated
rm -rf build
conda clean --all --y
conda env create -f conda/dev.yml -n zppy-rc2-20261019
conda activate zppy-rc2-20261019
pre-commit run --all-files
python -m pip install .

We already ran testing here.

Step 2: Determine what the new version should be

Reviewing the commit log, we find:

These changes continue to justify a minor release. So, we'll keep the increment from zppy v3.2.0 to zppy v3.3.0.

Step 3: Confluence

The E3SM Unified version tracking page was already updated while making rc1

Version Unified zstash
Current version e3sm-unified 1.13.0 0.2.1
Next versions e3sm-unified 1.14.0 3.3.0 (updated today)

Step 4: tbump

cd ~/ez/zppy
git status # Check for uncommitted changes
# nothing to commit, working tree clean
git fetch upstream main
git checkout -b v3.3.0rc2 upstream/main
tbump 3.3.0rc2 --no-tag
git diff HEAD^ HEAD | cat # Looks good
git push upstream v3.3.0rc2
# Create, and "Update version" label" to, and merge https://github.com/E3SM-Project/zppy/pull/891

Created #891

Step 5: Tag the RC on the zppy repo

git checkout main
git fetch upstream
git reset --hard upstream/main
git tag -a v3.3.0rc2 -m "v3.3.0rc2"
# Delete the branch from the tbump step. Otherwise, the push command won't work.
git branch -D v3.3.0rc2
git push upstream v3.3.0rc2

Good, appears on Tags, but not on Releases

Step 6: zppy-feedstock repo

cd ~/zppy-feedstock
curl -sL https://github.com/E3SM-Project/zppy/archive/v3.3.0rc2.tar.gz | openssl sha256
# SHA2-256(stdin)= 451d8259029605adc4aef87265f89b78b1cb3e6adcfdc2c1d5345389c308a025
git status # Check for uncommitted changes
# nothing to commit, working tree clean
git fetch upstream dev
git checkout -b v3.3.0rc2 upstream/dev
emacs recipe/recipe.yaml
# version: 3.3.0rc2
# sha256: ... # The sha256 from the previous step
# number: 0 # build >>> number should always be 0

# From https://github.com/conda-forge/zppy-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/zppy/compare/v3.3.0rc1...v3.3.0rc2

# conda/dev.yml has no changes

git add -A
git commit -m "v3.3.0rc2"
git push forsyth2 v3.3.0rc2

Created conda-forge/zppy-feedstock#40

@xylar
xylar deleted the v3.3.0rc2 branch October 19, 2026 20:15
@forsyth2

Copy link
Copy Markdown
Collaborator Author
# Delete the branch from the tbump step. Otherwise, the push command won't work.
git branch -D v3.3.0rc2
git push upstream v3.3.0rc2

Remember the branch must be deleted not only locally but also on GitHub!

@forsyth2 forsyth2 mentioned this pull request Oct 19, 2026
4 of 5 tasks
@xylar

xylar commented Oct 19, 2026

Copy link
Copy Markdown
Collaborator

Please update the instructions to use a different branch name.

@forsyth2 forsyth2 mentioned this pull request Oct 19, 2026
1 of 7 tasks
@forsyth2

Copy link
Copy Markdown
Collaborator Author

Please update the instructions to use a different branch name.

Addressed on #893

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