Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature_2609_tc_di…
Browse files Browse the repository at this point in the history
…ag_missing_data
  • Loading branch information
JohnHalleyGotway committed Aug 30, 2023
2 parents a2f0ebb + 7f913b1 commit 4a91bda
Show file tree
Hide file tree
Showing 190 changed files with 421 additions and 295 deletions.
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@ Describe the steps to reproduce the behavior:
- [ ] Select **scientist(s)** or **no scientist** required

### Labels ###
- [ ] Review default **alert** labels
- [ ] Select **component(s)**
- [ ] Select **priority**
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Organization** level **Project** for support of the current coordinated release
- [ ] Select **Repository** level **Project** for development toward the next official release or add **alert: NEED CYCLE ASSIGNMENT** label
### Milestone and Projects ###
- [ ] Select **Milestone** as the next bugfix version
- [ ] Select **Coordinated METplus-X.Y Support** project for support of the current coordinated release
- [ ] Select **MET-X.Y.Z Development** project for development toward the next official release

## Define Related Issue(s) ##
Consider the impact to the other METplus components.
Expand All @@ -70,14 +71,14 @@ Branch name: `bugfix_<Issue Number>_main_<Version>_<Description>`
Pull request: `bugfix <Issue Number> main_<Version> <Description>`
- [ ] Define the pull request metadata, as permissions allow.
Select: **Reviewer(s)** and **Development** issue
Select: **Organization** level software support **Project** for the current coordinated release
Select: **Milestone** as the next bugfix version
Select: **Coordinated METplus-X.Y Support** project for support of the current coordinated release
- [ ] Iterate until the reviewer(s) accept and merge your changes.
- [ ] Delete your fork or branch.
- [ ] Complete the steps above to fix the bug on the **develop** branch.
Branch name: `bugfix_<Issue Number>_develop_<Description>`
Pull request: `bugfix <Issue Number> develop <Description>`
Select: **Reviewer(s)** and **Development** issue
Select: **Repository** level development cycle **Project** for the next official release
Select: **Milestone** as the next official version
Select: **MET-X.Y.Z Development** project for development toward the next official release
- [ ] Close this issue.
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/enhancement_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ Consider breaking the enhancement down into sub-issues.
- [ ] Select **scientist(s)** or **no scientist** required

### Labels ###
- [ ] Review default **alert** labels
- [ ] Select **component(s)**
- [ ] Select **priority**
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
- [ ] Select **Milestone** as the next official version or **Future Versions**
### Milestone and Projects ###
- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
- [ ] For the next official version, select the **MET-X.Y.Z Development** project

## Define Related Issue(s) ##
Consider the impact to the other METplus components.
Expand All @@ -58,9 +59,9 @@ Branch name: `feature_<Issue Number>_<Description>`
- [ ] Submit a pull request to merge into **develop**.
Pull request: `feature <Issue Number> <Description>`
- [ ] Define the pull request metadata, as permissions allow.
Select: **Reviewer(s)** and **Development** issues
Select: **Repository** level development cycle **Project** for the next official release
Select: **Reviewer(s)** and **Development** issue
Select: **Milestone** as the next official version
Select: **MET-X.Y.Z Development** project for development toward the next official release
- [ ] Iterate until the reviewer(s) accept and merge your changes.
- [ ] Delete your fork or branch.
- [ ] Close this issue.
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/new_feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ Consider breaking the new feature down into sub-issues.
- [ ] Select **scientist(s)** or **no scientist** required

### Labels ###
- [ ] Review default **alert** labels
- [ ] Select **component(s)**
- [ ] Select **priority**
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
- [ ] Select **Milestone** as the next official version or **Future Versions**
### Milestone and Projects ###
- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
- [ ] For the next official version, select the **MET-X.Y.Z Development** project

## Define Related Issue(s) ##
Consider the impact to the other METplus components.
Expand All @@ -62,9 +63,9 @@ Branch name: `feature_<Issue Number>_<Description>`
- [ ] Submit a pull request to merge into **develop**.
Pull request: `feature <Issue Number> <Description>`
- [ ] Define the pull request metadata, as permissions allow.
Select: **Reviewer(s)** and **Development** issues
Select: **Repository** level development cycle **Project** for the next official release
Select: **Reviewer(s)** and **Development** issue
Select: **Milestone** as the next official version
Select: **MET-X.Y.Z Development** project for development toward the next official release
- [ ] Iterate until the reviewer(s) accept and merge your changes.
- [ ] Delete your fork or branch.
- [ ] Close this issue.
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/sub-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ This is a sub-issue of #*List the parent issue number here*.
- [ ] Select **scientist(s)** or **no scientist** required

### Labels ###
- [ ] Review default **alert** labels
- [ ] Select **component(s)**
- [ ] Select **priority**
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
- [ ] Select **Milestone** as the next official version or **Future Versions**
### Milestone and Projects ###
- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
- [ ] For the next official version, select the **MET-X.Y.Z Development** project
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/task.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ Consider breaking the task down into sub-issues.
- [ ] Select **scientist(s)** or **no scientist** required

### Labels ###
- [ ] Review default **alert** labels
- [ ] Select **component(s)**
- [ ] Select **priority**
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
- [ ] Select **Milestone** as the next official version or **Future Versions**
### Milestone and Projects ###
- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas**
- [ ] For the next official version, select the **MET-X.Y.Z Development** project

## Define Related Issue(s) ##
Consider the impact to the other METplus components.
Expand All @@ -58,9 +59,9 @@ Branch name: `feature_<Issue Number>_<Description>`
- [ ] Submit a pull request to merge into **develop**.
Pull request: `feature <Issue Number> <Description>`
- [ ] Define the pull request metadata, as permissions allow.
Select: **Reviewer(s)** and **Development** issues
Select: **Repository** level development cycle **Project** for the next official release
Select: **Reviewer(s)** and **Development** issue
Select: **Milestone** as the next official version
Select: **MET-X.Y.Z Development** project for development toward the next official release
- [ ] Iterate until the reviewer(s) accept and merge your changes.
- [ ] Delete your fork or branch.
- [ ] Close this issue.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors
- [ ] Complete the PR definition above.
- [ ] Ensure the PR title matches the feature or bugfix branch name.
- [ ] Define the PR metadata, as permissions allow.
Select: **Reviewer(s)**
Select: **Organization** level software support **Project** or **Repository** level development cycle **Project**
Select: **Reviewer(s)** and **Development** issue
Select: **Milestone** as the version that will include these changes
Select: **Coordinated METplus-X.Y Support** project for bugfix releases or **MET-X.Y.Z Development** project for official releases
- [ ] After submitting the PR, select the :gear: icon in the **Development** section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
- [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
- [ ] Close the linked issue and delete your feature or bugfix branch from GitHub.
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ jobs:
needs: [job_control]
if: ${{ needs.job_control.outputs.run_unit_tests == 'true' }}
steps:
- uses: dtcenter/metplus-action-data-update@v2
- uses: dtcenter/metplus-action-data-update@v3
with:
docker_name: ${{ secrets.DOCKER_USERNAME }}
docker_pass: ${{ secrets.DOCKER_PASSWORD }}
repo_name: ${{ github.repository }}
data_prefix: unit_test
branch_name: ${{ needs.job_control.outputs.branch_name }}
branch_name: ${{ needs.job_control.outputs.truth_data_version }}
docker_data_dir: /data/input/MET_test_data
data_repo_dev: met-data-dev

Expand Down
2 changes: 1 addition & 1 deletion data/config/Ascii2NcConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ message_type_map = [
// Indicate a version number for the contents of this configuration file.
// The value should generally not be modified.
//
version = "V11.1.0";
version = "V12.0.0";
2 changes: 1 addition & 1 deletion data/config/EnsembleStatConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,6 @@ rng = {

grid_weight_flag = NONE;
output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/GenEnsProdConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,6 @@ ensemble_flag = {

////////////////////////////////////////////////////////////////////////////////

version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/GridDiagConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ mask = {

////////////////////////////////////////////////////////////////////////////////

version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/GridStatConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,6 @@ nc_pairs_flag = {
grid_weight_flag = NONE;
tmp_dir = "/tmp";
output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/IODA2NCConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ time_summary = {
////////////////////////////////////////////////////////////////////////////////

tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/MODEAnalysisConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,6 @@ unmatched = FALSE;

////////////////////////////////////////////////////////////////////////////////

version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/MODEConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,6 @@ shift_right = 0; // grid squares
////////////////////////////////////////////////////////////////////////////////

output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/MODEMultivarConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,6 @@ shift_right = 0; // grid squares
////////////////////////////////////////////////////////////////////////////////

output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/MTDConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,6 @@ txt_output = {

output_prefix = "";

version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/Madis2NcConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ time_summary = {
// Indicate a version number for the contents of this configuration file.
// The value should generally not be modified.
//
version = "V11.1.0";
version = "V12.0.0";
2 changes: 1 addition & 1 deletion data/config/PB2NCConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,6 @@ time_summary = {
////////////////////////////////////////////////////////////////////////////////

tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/PlotPointObsConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,6 @@ point_data = [
////////////////////////////////////////////////////////////////////////////////

tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/Point2GridConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ quality_mark_thresh = 2;
////////////////////////////////////////////////////////////////////////////////

tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/PointStatConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,6 @@ output_flag = {

tmp_dir = "/tmp";
output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/RMWAnalysisConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ valid_mask = "";

////////////////////////////////////////////////////////////////////////////////

version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////

2 changes: 1 addition & 1 deletion data/config/STATAnalysisConfig_CBS_Index
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,6 @@ hss_ec_value = NA;
rank_corr_flag = FALSE;
vif_flag = FALSE;
tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/STATAnalysisConfig_GO_Index
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ hss_ec_value = NA;
rank_corr_flag = FALSE;
vif_flag = FALSE;
tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/STATAnalysisConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@ hss_ec_value = NA;
rank_corr_flag = FALSE;
vif_flag = FALSE;
tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/SeriesAnalysisConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,6 @@ output_stats = {
hss_ec_value = NA;
rank_corr_flag = FALSE;
tmp_dir = "/tmp";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/TCDiagConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,6 @@ cira_diag_flag = FALSE;

tmp_dir = "/tmp";
output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/TCGenConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,4 @@ nc_pairs_grid = "G003";
// Indicate a version number for the contents of this configuration file.
// The value should generally not be modified.
//
version = "V11.1.0";
version = "V12.0.0";
2 changes: 1 addition & 1 deletion data/config/TCPairsConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,4 @@ basin_map = [
// Indicate a version number for the contents of this configuration file.
// The value should generally not be modified.
//
version = "V11.1.0";
version = "V12.0.0";
2 changes: 1 addition & 1 deletion data/config/TCRMWConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ radial_velocity_long_field_name = "Radial Velocity";

////////////////////////////////////////////////////////////////////////////////

version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
2 changes: 1 addition & 1 deletion data/config/TCStatConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -216,4 +216,4 @@ jobs = [];
// Indicate a version number for the contents of this configuration file.
// The value should generally not be modified.
//
version = "V11.1.0";
version = "V12.0.0";
2 changes: 1 addition & 1 deletion data/config/WaveletStatConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,6 @@ wvlt_plot = {
////////////////////////////////////////////////////////////////////////////////

output_prefix = "";
version = "V11.1.0";
version = "V12.0.0";

////////////////////////////////////////////////////////////////////////////////
1 change: 1 addition & 0 deletions data/table_files/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
tablefilesdir = $(pkgdatadir)/table_files

tablefiles_DATA = \
met_header_columns_V12.0.txt \
met_header_columns_V11.1.txt \
met_header_columns_V11.0.txt \
met_header_columns_V10.1.txt \
Expand Down
1 change: 1 addition & 0 deletions data/table_files/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
tablefilesdir = $(pkgdatadir)/table_files
tablefiles_DATA = \
met_header_columns_V12.0.txt \
met_header_columns_V11.1.txt \
met_header_columns_V11.0.txt \
met_header_columns_V10.1.txt \
Expand Down
Loading

0 comments on commit 4a91bda

Please sign in to comment.