Bring 1.35.1 and 1.35.2 changes to release-1.35-stable #21
Conversation
This file contains 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
remove NAs from computation Co-authored-by: Kara Woo <karawoo@users.noreply.github.com>
Co-authored-by: Kara Woo <karawoo@users.noreply.github.com>
karawoo
changed the title
jasmineirx
approved these changes
Sep 18, 2021
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.
Release 1.35.3 is missing the changes introduced in 1.35.1 (to baseline scr calculations) and 1.35.2 (allowing grams as in input unit in weight2kg). I am guessing that instead of branching off of the previous tag and cherry picking the commits for 1.35.3, we tagged the latest commit of release-1.35-stable, which was missing these changes. This is causing issues for downstream tests.
I believe we have two ways to fix the current failures: 1) merge this PR and create a new tag, 2) branch off of 1.35.2, cherry pick the commits that went into 1.35.3, and create a new tag. Merging the PR seems easier (and it seems good to have these changes in release-1.35-stable, though I don't know if we strictly need the stable release branch anymore).