diff --git a/.github/update_truth_change_log.txt b/.github/update_truth_change_log.txt index 70ae296cd..8574115e4 100644 --- a/.github/update_truth_change_log.txt +++ b/.github/update_truth_change_log.txt @@ -12,3 +12,4 @@ [20241016_20:39:30 develop] #2710 - #2710 fixed a bug in a use case [20241113_21:34:39 develop] #2769 and #2785 - #2769 adds new use case for fire weather, #2785 turns on land_surface use case that was previously reporting differences that was resolved by bugfix dtcenter/MET#2899 [20241120_22:40:11 develop] dtcenter/METplotpy#476 - dtcenter/METplotpy#476 appears to have caused differences in an output image that is not noticeable upon visual review +[20241203_22:42:18 develop] dtcenter/MET#3008 - Adds new units attribute to Gen-Vx-Mask output diff --git a/.github/workflows/update_truth.yml b/.github/workflows/update_truth.yml index 6b190e42f..074c55a35 100644 --- a/.github/workflows/update_truth.yml +++ b/.github/workflows/update_truth.yml @@ -65,7 +65,7 @@ jobs: # get truth change log from *-ref branch cmd="git checkout origin/${branch_name}-ref -- ${change_log_path}" echo $cmd - $cmd + $cmd || true # create or append to file to track truth data changes # and ensure that PR merge into *-ref branch triggered testing workflow diff --git a/docs/Release_Guide/metplus_development.rst b/docs/Release_Guide/metplus_development.rst index be37a5d99..468f73414 100644 --- a/docs/Release_Guide/metplus_development.rst +++ b/docs/Release_Guide/metplus_development.rst @@ -12,6 +12,7 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra .. include:: release_steps/metplus/update_version.rst .. include:: release_steps/update_release_notes_development.rst .. include:: release_steps/update_upgrade_instructions.rst +.. include:: release_steps/metplus/update_development_timeline.rst .. include:: release_steps/merge_release_issue.rst .. include:: release_steps/metplus/create_release_reference_branch.rst .. include:: release_steps/create_release_on_github.rst diff --git a/docs/Release_Guide/release_steps/metplus/update_development_timeline.rst b/docs/Release_Guide/release_steps/metplus/update_development_timeline.rst new file mode 100644 index 000000000..1d2d134a3 --- /dev/null +++ b/docs/Release_Guide/release_steps/metplus/update_development_timeline.rst @@ -0,0 +1,14 @@ +Update Development Timeline +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +* For the METplus repository, update the **development timeline** under the + `METplus Release Information `_ + section. + + * If you are creating a beta1 release, add development timeline + information with approximate dates for planned development cycles. + + * For other development release, edit the actual release dates and planned + release dates for future development cycles, as needed. + +* Commit changes and push to GitHub. diff --git a/docs/Release_Guide/release_steps/metplus/update_version.rst b/docs/Release_Guide/release_steps/metplus/update_version.rst index 3f1955d11..ab6358a0c 100644 --- a/docs/Release_Guide/release_steps/metplus/update_version.rst +++ b/docs/Release_Guide/release_steps/metplus/update_version.rst @@ -1,21 +1,22 @@ Update Version Number for Release ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. note:: +.. dropdown:: If creating a betaN release - These instructions only apply when creating a **beta** - (betaN) development release. Skip this section for - release candidate (rcN) development releases. + Remove **-dev** from the version number: -Remove **-dev** from the version number: + * As of METplus v4.0.0-beta2, we are naming releases with X.Y.Z format even if Z is 0. + As of METplus v4.0.0-beta4, the file containing the version number is located at metplus/VERSION + (in earlier releases, the file was located at docs/version or doc/version). -* As of METplus v4.0.0-beta2, we are naming releases with X.Y.Z format even if Z is 0. - As of METplus v4.0.0-beta4, the file containing the version number is located at metplus/VERSION - (in earlier releases, the file was located at docs/version or doc/version). + * In the develop branch, the version should match the upcoming release with -dev + added to the end like X.Y.Z-betaN-dev, i.e. 4.0.0-beta1-dev -* In the develop branch, the version should match the upcoming release with -dev - added to the end like X.Y.Z-betaN-dev, i.e. 4.0.0-beta1-dev + * Remove **-dev** from the version number so that it matches the release you are creating. -* Remove **-dev** from the version number so that it matches the release you are creating. + * Commit changes and push to GitHub. -* Commit changes and push to GitHub. + +.. dropdown:: If creating an rcN release + + Continue to the next instruction. diff --git a/docs/Release_Guide/release_steps/update_release_notes_development.rst b/docs/Release_Guide/release_steps/update_release_notes_development.rst index 4055dc0c9..e546970ed 100644 --- a/docs/Release_Guide/release_steps/update_release_notes_development.rst +++ b/docs/Release_Guide/release_steps/update_release_notes_development.rst @@ -30,14 +30,4 @@ release. Open the following URL in a browser: * If you are creating a betaX release, add a new betaX section above the betaX-1 release. -* For the METplus repository, update the **development timeline** under the - `METplus Release Information `_ - section. - - * If you are creating a beta1 release, add development timeline - information with approximate dates for planned development cycles. - - * For other development release, edit the actual release dates and planned - release dates for future development cycles, as needed. - * Commit changes and push to GitHub. diff --git a/docs/use_cases/use_case_documentation_template.py b/docs/use_cases/use_case_documentation_template.py index 3429b3116..e11995778 100644 --- a/docs/use_cases/use_case_documentation_template.py +++ b/docs/use_cases/use_case_documentation_template.py @@ -137,7 +137,7 @@ # .. literalinclude:: ../../../../parm/use_cases/model_applications/marine_and_cryosphere/PointStat_fcstGFS_obsASCAT_satelliteWinds/read_ASCAT_data.py # # For more information on the basic requirements to utilize Python Embedding in METplus, -# please refer to the MET User’s Guide section on `Python embedding `_ +# please refer to the MET User’s Guide section on `Python embedding `_. ############################################################################## # User Scripting