Repository navigation
Conversation
Collaborator
Author
Creating zppy rc2
Step 1: TestingWe'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 beReviewing the commit log, we find:
These changes continue to justify a minor release. So, we'll keep the increment from Step 3: ConfluenceThe E3SM Unified version tracking page was already updated while making rc1
Step 4: tbumpcd ~/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/891Created #891 Step 5: Tag the RC on the zppy repogit 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.0rc2Good, appears on Tags, but not on Releases Step 6: zppy-feedstock repocd ~/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.0rc2Created conda-forge/zppy-feedstock#40 |
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.0rc2Remember the branch must be deleted not only locally but also on GitHub! |
4 of 5 tasks
Collaborator
|
Please update the instructions to use a different branch name. |
1 of 7 tasks
Collaborator
Author
Addressed on #893 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bump to 3.3.0rc2