NCAR / wrfcloud

WRF Cloud Framework
Apache License 2.0
15 stars 6 forks source link

Update develop with Release v1.1 changes #229

Closed georgemccabe closed 1 year ago

georgemccabe commented 1 year ago

The PR from main -> develop showed the same 27 commits with 1 extra commit for the merge commit that resolved the conflicts. This PR has 1 extra commit to resolve the 1 conflict.

The main branch has already been updated to include the changes from release_v1.1, so I added a commit to the release_v1.1 branch to revert the python package versions in setup.py to use relative versions instead of the exact versions used for the release. That change is reflected in this PR.

Expected Differences

Pull Request Testing

Review changes in case there are any changes that shouldn't be merged into develop.

Pull Request Checklist

fossell commented 1 year ago

@georgemccabe - Will we delete release_v1.1 branch after this is complete then? Just want to make sure we don't have issues down the road if we needed to do something with this release and the branch is still there but without the static versions. If we needed a bug fix, we would just create a new release branch for that bug fix version off of main branch then, right?

georgemccabe commented 1 year ago

@fossell, we shouldn't need the release branch anymore. The branch was actually automatically deleted by GitHub after I merged the release_v1.1 -> main pull request. I had to click the restore button to get it back for the next pull request into develop.

If we need to apply a bugfix, we would create a bugfix branch off of main.

fossell commented 1 year ago

@hahnd - Will take a quick look and approve too?

fossell commented 1 year ago

@georgemccabe - please merge when you have a chance. thanks!