diff --git a/.github/jobs/setup_and_run_diff.py b/.github/jobs/setup_and_run_diff.py index 59c5be37e..995a3357d 100755 --- a/.github/jobs/setup_and_run_diff.py +++ b/.github/jobs/setup_and_run_diff.py @@ -18,9 +18,9 @@ RUNNER_WORKSPACE = os.environ.get('RUNNER_WORKSPACE') GITHUB_WORKSPACE = os.environ.get('GITHUB_WORKSPACE') -REPO_NAME = os.path.basename(RUNNER_WORKSPACE) -WS_PATH = os.path.join(RUNNER_WORKSPACE, REPO_NAME) -print(f"WS_PATH is {WS_PATH}") +REPO_NAME = os.path.basename(GITHUB_WORKSPACE) +METPLUS_DEVELOP_PATH = os.path.join(GITHUB_WORKSPACE, f"{REPO_NAME}.develop") +print(f"METPLUS_DEVELOP_PATH is {METPLUS_DEVELOP_PATH}") print(f"GITHUB_WORKSPACE is {GITHUB_WORKSPACE}") INPUT_CATEGORIES = sys.argv[1] @@ -50,7 +50,7 @@ print(f"Output Volumes: {VOLUMES_FROM}") VOLUME_MOUNTS = [ - f'-v {WS_PATH}:{GITHUB_WORKSPACE}', + f'-v {METPLUS_DEVELOP_PATH}:{GITHUB_WORKSPACE}', f'-v {RUNNER_WORKSPACE}/output:/data/output', f'-v {RUNNER_WORKSPACE}/diff:/data/diff', ] diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index b7c6f9bd3..e5dcea8f6 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -213,6 +213,19 @@ jobs: if: ${{ always() && steps.run_tests.conclusion == 'failure' }} run: .github/jobs/save_error_logs.sh + # checkout METplus diff_util.py from develop branch if running diff tests + - name: Checkout METplus diff util from develop branch + if: ${{ needs.job_control.outputs.run_diff == 'true' && steps.run_tests.conclusion == 'success' }} + uses: actions/checkout@v4 + with: + repository: 'dtcenter/metplus' + ref: 'develop' + path: METplus.develop + sparse-checkout: | + metplus/util/diff_util.py + .github/jobs/run_diff_docker.py + sparse-checkout-cone-mode: false + # run difference testing - name: Run difference tests id: run-diff diff --git a/docs/Users_Guide/existing_builds.rst b/docs/Users_Guide/existing_builds.rst index cd1c8c747..82996444b 100644 --- a/docs/Users_Guide/existing_builds.rst +++ b/docs/Users_Guide/existing_builds.rst @@ -585,29 +585,29 @@ in the .. dropdown:: DockerHub | **MET** - | *Last Updated: July 30, 2025* + | *Last Updated: February 27, 2026* .. code-block:: ini - docker pull dtcenter/met:12.1.0 + docker pull dtcenter/met:12.1.2 `dtcenter/met DockerHub `_ | **METplus** - | *Last Updated: July 30, 2025* + | *Last Updated: March 2, 2026* .. code-block:: ini - docker pull dtcenter/metplus:6.1.0 + docker pull dtcenter/metplus:6.1.1 `dtcenter/metplus DockerHub `_ | **METplus Analysis** - | *Last Updated: July 30, 2025* + | *Last Updated: March 2, 2026* .. code-block:: ini - docker pull dtcenter/metplus-analysis:6.1.0 + docker pull dtcenter/metplus-analysis:6.1.1 `dtcenter/metplus-analysis DockerHub `_ diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst index 6ba4185a7..67da9f9de 100644 --- a/docs/Users_Guide/release-notes.rst +++ b/docs/Users_Guide/release-notes.rst @@ -43,6 +43,16 @@ When applicable, release notes are followed by the describes the bugfix, enhancement, or new feature. Important issues are listed **in bold** for emphasis. + +METplus Version 6.1.1 Release Notes (2026-03-02) +------------------------------------------------ + + .. dropdown:: Bugfix + + * Update dateutil comparisons and s2s use case to support Python 3.14 + (`#3228 `_) + + METplus Version 6.1.0 Release Notes (2025-07-30) ------------------------------------------------ diff --git a/metplus/RELEASE_DATE b/metplus/RELEASE_DATE index e0c955b41..cfddcf5f3 100644 --- a/metplus/RELEASE_DATE +++ b/metplus/RELEASE_DATE @@ -1 +1 @@ -20250730 \ No newline at end of file +20260302 \ No newline at end of file diff --git a/metplus/VERSION b/metplus/VERSION index 358e78e60..132c6def5 100644 --- a/metplus/VERSION +++ b/metplus/VERSION @@ -1 +1 @@ -6.1.0 \ No newline at end of file +6.1.1 \ No newline at end of file