Skip to content

Commit

Permalink
Update develop-ref after dtcenter/MET#3036 (#2867)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jan 16, 2025
1 parent 97aef7f commit 31e0e44
Show file tree
Hide file tree
Showing 117 changed files with 1,198 additions and 929 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Describe the steps to reproduce the behavior:
*3. Scroll down to '....'*
*4. See error*
*Post relevant sample data following these instructions:*
*https://dtcenter.org/community-code/model-evaluation-tools-met/met-help-desk#ftp*
*https://github.com/dtcenter/METplus/discussions/954*

### Relevant Deadlines ###
*List relevant project deadlines here or state NONE.*
Expand Down
4 changes: 0 additions & 4 deletions .github/jobs/free_disk_space.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ cmd="docker image prune -af"
printf "\nRunning $cmd"
$cmd

cmd=docker system prune -af
printf "\nRunning $cmd"
$cmd

cmd="docker images"
printf "\nAFTER CLEANUP: $cmd"
$cmd
Expand Down
4 changes: 4 additions & 0 deletions .github/labels/common_labels.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
{"name": "component: testing","color": "1d76db","description": "Software testing issue"}
{"name": "component: training","color": "1d76db","description": "Training issue"}
{"name": "component: user support","color": "1d76db","description": "User support issue"}
{"name": "pull request: MODIFIES CONFIG","color": "c2e0c6","description": "Changes that add new or modify existing configuration options"}
{"name": "pull request: MODIFIES OUTPUT","color": "c2e0c6","description": "Changes that add new or modify existing output formats"}
{"name": "priority: blocker","color": "b60205","description": "Blocker"}
{"name": "priority: high","color": "ed2939","description": "High Priority"}
{"name": "priority: low","color": "cce88d","description": "Low Priority"}
{"name": "priority: medium","color": "f8de7e","description": "Medium Priority"}
{"name": "priority: bold for release notes","color": "ededed","description": "Issue should be bolded in release notes"}
{"name": "reporting: DTC AF METplus","color": "fbca04","description": "Air Force METplus Project"}
{"name": "reporting: DTC NCAR Base","color": "fbca04","description": "NCAR Base DTC Project"}
{"name": "reporting: DTC NOAA BASE","color": "fbca04","description": "NOAA Office of Atmospheric Research DTC Project"}
{"name": "reporting: DTC NOAA OAR","color": "fbca04","description": "NOAA Office of Atmospheric Research DTC Project"}
{"name": "reporting: DTC NOAA R2O","color": "fbca04","description": "NOAA Research to Operations DTC Project"}
{"name": "reporting: HSUP 1-3a","color": "fbca04","description": "Hurricane Supplemental Project 1-3a"}
Expand Down Expand Up @@ -49,6 +52,7 @@
{"name": "requestor: NOAA/MDL","color": "3101c1","description": "NOAA Meteorological Development Laboratory"}
{"name": "requestor: NOAA/NHC","color": "3101c1","description": "NOAA National Hurricane Center"}
{"name": "requestor: NOAA/NSSL","color": "3101c1","description": "NOAA National Severe Storms Laboratory"}
{"name": "requestor: NOAA/NWS","color": "3101c1","description": "NOAA National Weather Service"}
{"name": "requestor: NOAA/OPC","color": "3101c1","description": "NOAA Ocean Prediction Center"}
{"name": "requestor: NOAA/other","color": "3101c1","description": "NOAA Laboratory, not otherwise specified"}
{"name": "requestor: NOAA/PSD","color": "3101c1","description": "NOAA Physical Sciences Laboratory"}
Expand Down
6 changes: 3 additions & 3 deletions .github/labels/delete_labels.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

# Must specify 3 arguments:
# - username
Expand All @@ -23,7 +23,7 @@ COMMON_LABELS="`dirname $0`/common_labels.txt"

# Output command file
CMD_FILE="`dirname $0`/commands/delete_labels_${repo}_cmd.sh"
echo "#!/bin/sh -v" > ${CMD_FILE}
echo "#!/bin/bash -v" > ${CMD_FILE}

# Get the current repo labels
SCRIPT_DIR=`dirname $0`
Expand All @@ -47,7 +47,7 @@ while read -r line; do
is_common=`egrep -i "\"${name}\"" ${COMMON_LABELS} | wc -l`

# Check if its a custom label that beginning with component, type, or repository name
is_custom=`echo ${name} | egrep -r -i "component:|type:|${repo}" | wc -l`
is_custom=`echo ${name} | egrep -i "component:|type:|^MET" | wc -l`

# Keep COMMON labels
if [[ $is_common -gt 0 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/labels/get_labels.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

# Must specify 3 arguments:
# - username
Expand Down
4 changes: 2 additions & 2 deletions .github/labels/post_patch_labels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ URL="https://api.github.com/repos/dtcenter/${repo}/labels"

# Output command files
POST_CMD_FILE="`dirname $0`/commands/post_labels_${repo}_cmd.sh"
echo "#!/bin/sh -v" > ${POST_CMD_FILE}
echo "#!/bin/bash -v" > ${POST_CMD_FILE}

PATCH_CMD_FILE="`dirname $0`/commands/patch_labels_${repo}_cmd.sh"
echo "#!/bin/sh -v" > ${PATCH_CMD_FILE}
echo "#!/bin/bash -v" > ${PATCH_CMD_FILE}

# Initialize counts
n_post=0
Expand Down
2 changes: 1 addition & 1 deletion .github/labels/process_labels.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

# Must specify 2 arguments:
# - username
Expand Down
1 change: 1 addition & 0 deletions .github/update_truth_change_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
[20241203_22:42:18 develop] dtcenter/MET#3008 - Adds new units attribute to Gen-Vx-Mask output
[$(date +%Y%m%d_%H:%M:%S) ${branch_name}] #2836 - #2836 modified a use case to sort files to produce consistent results for each run
[$(date +%Y%m%d_%H:%M:%S) ${branch_name}] #2817 - #2817 changed the output file name for the s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking use case
[$(date +%Y%m%d_%H:%M:%S) ${branch_name}] dtcenter/MET#3036 - dtcenter/MET#3036 adds new columns
1 change: 0 additions & 1 deletion docs/Release_Guide/met_bugfix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
.. include:: release_steps/update_release_notes_bugfix.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/met/update_dtc_website.rst
.. include:: release_steps/update_version_lookup.rst
.. include:: release_steps/finalize_release_on_github_bugfix.rst
1 change: 0 additions & 1 deletion docs/Release_Guide/met_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
.. include:: release_steps/met/create_release_reference_branch.rst
.. include:: release_steps/create_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/met/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_development.rst
.. include:: release_steps/release_acceptance_testing.rst
1 change: 0 additions & 1 deletion docs/Release_Guide/met_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/met/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_official.rst
.. include:: release_steps/met/update_tar_files_link_official.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metcalcpy_bugfix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
.. include:: release_steps/update_release_notes_bugfix.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/update_version_lookup.rst
.. include:: release_steps/finalize_release_on_github_official.rst
1 change: 0 additions & 1 deletion docs/Release_Guide/metcalcpy_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_development.rst
.. include:: release_steps/release_acceptance_testing.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metcalcpy_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_official.rst
.. include:: release_steps/metcalcpy/update_version_on_develop.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metdataio_bugfix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
.. include:: release_steps/update_release_notes_bugfix.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/common/update_dtc_website.rst
.. include:: release_steps/update_version_lookup.rst
.. include:: release_steps/finalize_release_on_github_bugfix.rst
3 changes: 1 addition & 2 deletions docs/Release_Guide/metdataio_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ METdataio Development Release
.. |projectName| replace:: |projectRepo|
.. |addTarfileStep| replace:: Link text should be the name of the release and the URL should be the release page that was just created under the GitHub Releases tab.
.. |otherWebsiteUpdates| replace:: Make any other necessary website updates.

Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop branch while working toward an official vX.Y.Z release.

.. include:: release_steps/open_release_issue.rst
Expand All @@ -18,7 +18,6 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/common/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_development.rst
.. include:: release_steps/release_acceptance_testing.rst
Expand Down
3 changes: 1 addition & 2 deletions docs/Release_Guide/metdataio_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ METdataio Official Release
.. |projectName| replace:: |projectRepo|
.. |addTarfileStep| replace:: Link text should be the name of the release and the URL should be the release page that was just created under the GitHub Releases tab.
.. |otherWebsiteUpdates| replace:: Make any other necessary website updates.

Create a new vX.Y.Z official release from the develop branch.

.. include:: release_steps/open_release_issue.rst
Expand All @@ -18,7 +18,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/common/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_official.rst
.. include:: release_steps/metdataio/update_version_on_develop.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metexpress_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/metexpress/tag_app_version_and_build.rst
.. include:: release_steps/metexpress/deploy_beta_apps.rst
.. include:: release_steps/metexpress/deploy_production_apps.rst
.. include:: release_steps/metexpress/deploy_AWS_apps.rst
.. include:: release_steps/metexpress/pull_changes_and_merge_to_dev.rst
.. include:: release_steps/update_docs_official.rst
.. include:: release_steps/metexpress/update_dtc_website.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metplotpy_bugfix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
.. include:: release_steps/update_release_notes_bugfix.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/update_version_lookup.rst
.. include:: release_steps/finalize_release_on_github_official.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metplotpy_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_development.rst
.. include:: release_steps/release_acceptance_testing.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metplotpy_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_official.rst
.. include:: release_steps/metplotpy/update_version_official.rst
Expand Down
3 changes: 1 addition & 2 deletions docs/Release_Guide/metplus_bugfix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
.. include:: release_steps/update_release_notes_bugfix.rst
.. include:: release_steps/metplus/update_existing_builds_docker.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/metplus/create_release_extra.rst
.. include:: release_steps/metplus/create_release_on_github.rst
.. include:: release_steps/metplus/update_dtc_website.rst
.. include:: release_steps/update_version_lookup.rst
.. include:: release_steps/finalize_release_on_github_official.rst
3 changes: 1 addition & 2 deletions docs/Release_Guide/metplus_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
.. include:: release_steps/metplus/update_existing_builds_docker.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
.. include:: release_steps/metplus/create_release_extra.rst
.. include:: release_steps/metplus/create_release_on_github.rst
.. include:: release_steps/metplus/update_version_on_develop.rst
.. include:: release_steps/metplus/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_development.rst
Expand Down
5 changes: 2 additions & 3 deletions docs/Release_Guide/metplus_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ METplus Official Release
.. |projectRepo| replace:: METplus

Create a new vX.Y.Z official release from the develop branch.

.. include:: release_steps/open_release_issue.rst
.. include:: release_steps/clone_project_repository.rst
.. include:: release_steps/checkout_main_branch.rst
Expand All @@ -17,8 +17,7 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/metplus/update_existing_builds_docker.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/metplus/create_release_extra.rst
.. include:: release_steps/metplus/create_release_on_github.rst
.. include:: release_steps/metplus/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_official.rst
.. include:: release_steps/update_docs_official.rst
Expand Down
3 changes: 1 addition & 2 deletions docs/Release_Guide/metviewer_bugfix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ METviewer Bugfix Release

Create a new vX.Y.Z bugfix release from the main_vX.Y branch.

.. include:: release_steps/open_release_issue.rst
.. include:: release_steps/open_release_issue.rst
.. include:: release_steps/clone_project_repository.rst
.. include:: release_steps/checkout_main_branch.rst
.. include:: release_steps/create_release_feature_branch.rst
.. include:: release_steps/metviewer/update_version_bugfix.rst
.. include:: release_steps/update_release_notes_bugfix.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/update_version_lookup.rst
.. include:: release_steps/finalize_release_on_github_official.rst
1 change: 0 additions & 1 deletion docs/Release_Guide/metviewer_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_development.rst
.. include:: release_steps/release_acceptance_testing.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metviewer_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
.. include:: release_steps/update_dtc_website.rst
.. include:: release_steps/finalize_release_on_github_official.rst
.. include:: release_steps/metviewer/update_version_on_develop.rst
Expand Down
10 changes: 6 additions & 4 deletions docs/Release_Guide/release_steps/checkout_main_branch.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
Checkout the Main Branch
^^^^^^^^^^^^^^^^^^^^^^^^

Checkout the main branch for the X.Y release. If you are creating
the |projectRepo|-X.Y.Z official or bugfix release, checkout main_vX.Y.
.. dropdown:: Instructions

.. parsed-literal::
Checkout the main branch for the X.Y release. If you are creating
the |projectRepo|-X.Y.Z official or bugfix release, checkout main_vX.Y.

git checkout main_vX.Y
.. parsed-literal::
git checkout main_vX.Y
22 changes: 13 additions & 9 deletions docs/Release_Guide/release_steps/checkout_source_branch.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
Checkout the Source Branch
^^^^^^^^^^^^^^^^^^^^^^^^^^

* If creating a **beta** (betaN) or **first release candidate** (rc1) release,
checkout the develop branch:
Checkout the source branch based on the type of release to be created.

.. parsed-literal::
.. dropdown:: If creating a beta or rc1 release

git checkout develop
* If creating a **beta** (betaN) or **first release candidate** (rc1) release,
checkout the develop branch:

**OR**
.. parsed-literal::
* If creating a **later release candidate** (rc2+) release,
checkout the appropriate main branch:
git checkout develop
.. parsed-literal::
.. dropdown:: If creating an rc2+ release

git checkout main_vX.Y
* If creating a **later release candidate** (rc2+) release,
checkout the appropriate main branch:

.. parsed-literal::
git checkout main_vX.Y
32 changes: 18 additions & 14 deletions docs/Release_Guide/release_steps/clone_project_repository.rst
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
Clone the Project Repository
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

* Create and work in a new directory to ensure a fresh environment:
Clone the repository onto your local machine.

.. parsed-literal::
.. dropdown:: Instructions

mkdir release-X.Y.Z
cd release-X.Y.Z
* Create and work in a new directory to ensure a fresh environment:

* Run the clone command to obtain the repository.
.. parsed-literal::
Using SSH:
mkdir release-X.Y.Z
cd release-X.Y.Z
.. parsed-literal::
* Run the clone command to obtain the repository.

git clone [email protected]:dtcenter/|projectRepo|
Using SSH:

Using HTTP:
.. parsed-literal::
.. parsed-literal::
git clone [email protected]:dtcenter/|projectRepo|
git clone https://github.com/dtcenter/|projectRepo|
Using HTTP:

* Enter the project repository directory:
.. parsed-literal::
.. parsed-literal::
git clone https://github.com/dtcenter/|projectRepo|
cd |projectRepo|
* Enter the project repository directory:

.. parsed-literal::
cd |projectRepo|
Loading

0 comments on commit 31e0e44

Please sign in to comment.