From 35a17dc4a8e3b5fb75b231019b7feb1ae9fc67d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 16:21:35 +0000 Subject: [PATCH] ci(release): update version to 6.5.0 --- .build_rtd_docs/Doxyfile | 2 +- CITATION.cff | 4 ++-- DISCLAIMER.md | 17 +++++++++-------- README.md | 19 ++++++++++--------- code.json | 6 +++--- doc/version.py | 4 ++-- doc/version.tex | 4 ++-- meson.build | 2 +- pixi.toml | 4 ++-- src/Utilities/version.f90 | 26 ++++++++++++++------------ version.txt | 2 +- 11 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.build_rtd_docs/Doxyfile b/.build_rtd_docs/Doxyfile index 1dc8033b435..95a4d26625d 100644 --- a/.build_rtd_docs/Doxyfile +++ b/.build_rtd_docs/Doxyfile @@ -37,7 +37,7 @@ PROJECT_NAME = "MODFLOW 6" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "version 6.5.0.dev0" +PROJECT_NUMBER = "version 6.5.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/CITATION.cff b/CITATION.cff index 08cfa01c6d4..af515842683 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite the software itself. type: software title: MODFLOW 6 Modular Hydrologic Model -version: 6.5.0.dev2 -date-released: '2024-02-13' +version: 6.5.0 +date-released: '2024-05-23' doi: 10.5066/F76Q1VQV abstract: MODFLOW 6 is an object-oriented program and framework developed to provide a platform for supporting multiple models and multiple types of models within the diff --git a/DISCLAIMER.md b/DISCLAIMER.md index f32778cb5e4..9226475a939 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -1,11 +1,12 @@ Disclaimer ---------- -This software is preliminary or provisional and is subject to revision. It is -being provided to meet the need for timely best science. The software has not -received final approval by the U.S. Geological Survey (USGS). No warranty, -expressed or implied, is made by the USGS or the U.S. Government as to the -functionality of the software and related material nor shall the fact of release -constitute any such warranty. The software is provided on the condition that -neither the USGS nor the U.S. Government shall be held liable for any damages -resulting from the authorized or unauthorized use of the software. +This software has been approved for release by the U.S. Geological Survey +(USGS). Although the software has been subjected to rigorous review, the USGS +reserves the right to update the software as needed pursuant to further analysis +and review. No warranty, expressed or implied, is made by the USGS or the U.S. +Government as to the functionality of the software and related material nor +shall the fact of release constitute any such warranty. Furthermore, the +software is released on condition that neither the USGS nor the U.S. Government +shall be held liable for any damages resulting from its authorized or +unauthorized use. diff --git a/README.md b/README.md index f2d96047b8f..fa742b249aa 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This is the development repository for the USGS MODFLOW 6 Hydrologic Model. The official USGS distribution is available at [USGS Release Page](https://water.usgs.gov/ogw/modflow/MODFLOW.html). -### Version 6.5.0.dev2 (preliminary) +### Version 6.5.0 [![GitHub release](https://img.shields.io/github/release/MODFLOW-USGS/modflow6.svg)](https://github.com/MODFLOW-USGS/modflow6/releases/latest) [![MODFLOW 6 continuous integration](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci.yml) @@ -110,12 +110,13 @@ Citations for specific versions are included with the [releases](https://github. Disclaimer ---------- -This software is preliminary or provisional and is subject to revision. It is -being provided to meet the need for timely best science. The software has not -received final approval by the U.S. Geological Survey (USGS). No warranty, -expressed or implied, is made by the USGS or the U.S. Government as to the -functionality of the software and related material nor shall the fact of release -constitute any such warranty. The software is provided on the condition that -neither the USGS nor the U.S. Government shall be held liable for any damages -resulting from the authorized or unauthorized use of the software. +This software has been approved for release by the U.S. Geological Survey +(USGS). Although the software has been subjected to rigorous review, the USGS +reserves the right to update the software as needed pursuant to further analysis +and review. No warranty, expressed or implied, is made by the USGS or the U.S. +Government as to the functionality of the software and related material nor +shall the fact of release constitute any such warranty. Furthermore, the +software is released on condition that neither the USGS nor the U.S. Government +shall be held liable for any damages resulting from its authorized or +unauthorized use. diff --git a/code.json b/code.json index 8edddb0aa5a..a2fa703adc0 100644 --- a/code.json +++ b/code.json @@ -1,6 +1,6 @@ [ { - "status": "Preliminary", + "status": "Release", "languages": [ "Fortran2008" ], @@ -18,9 +18,9 @@ "email": "langevin@usgs.gov" }, "laborHours": -1, - "version": "6.5.0.dev2", + "version": "6.5.0", "date": { - "metadataLastUpdated": "2024-02-13" + "metadataLastUpdated": "2024-05-23" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/version.py b/doc/version.py index b9069149d3d..9386a26a0a8 100644 --- a/doc/version.py +++ b/doc/version.py @@ -1,3 +1,3 @@ # MODFLOW 6 version file automatically created using...update_version.py -# created on...February 13, 2024 21:29:25 -__version__ = "6.5.0.dev2" +# created on...May 23, 2024 16:21:35 +__version__ = "6.5.0" diff --git a/doc/version.tex b/doc/version.tex index ae1627b11a1..8fdbf1ca67b 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.5.0.dev2} -\newcommand{\modflowdate}{February 13, 2024} +\newcommand{\modflowversion}{mf6.5.0} +\newcommand{\modflowdate}{May 23, 2024} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/meson.build b/meson.build index 0da78223a9e..f8cae64fed9 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'MODFLOW 6', 'fortran', - version: '6.5.0.dev2', + version: '6.5.0', license: 'CC0', meson_version: '>= 1.1.0', default_options : [ diff --git a/pixi.toml b/pixi.toml index 1f3d894a699..3e86897f9d7 100644 --- a/pixi.toml +++ b/pixi.toml @@ -2,7 +2,7 @@ name = "modflow6" channels = ["conda-forge"] platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64", "osx-64"] -version = "6.5.0.dev2" +version = "6.5.0" [dependencies] appdirs = "*" @@ -67,6 +67,6 @@ build-docs = { cmd = "python build_docs.py", cwd = "distribution" } build-dist = { cmd = "python build_dist.py", cwd = "distribution" } build-makefiles = { cmd = "python build_makefiles.py", cwd = "distribution" } test-dist-scripts = { cmd = "pytest -v --durations 0", cwd = "distribution" } -update-version = { cmd = "python update_version.py", cwd = "distribution" } +version = "6.5.0" deprecations = { cmd = "python deprecations.py", cwd = "doc/mf6io/mf6ivar" } sphinx = { cmd = "make html", cwd = ".build_rtd_docs" } \ No newline at end of file diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index 0f3fa1ce2ee..60a74653676 100644 --- a/src/Utilities/version.f90 +++ b/src/Utilities/version.f90 @@ -17,8 +17,8 @@ module VersionModule public ! -- modflow 6 version integer(I4B), parameter :: IDEVELOPMODE = 1 - character(len=*), parameter :: VERSIONNUMBER = '6.5.0.dev2' - character(len=*), parameter :: VERSIONTAG = ' (preliminary) 02/13/2024' + character(len=*), parameter :: VERSIONNUMBER = '6.5.0' + character(len=*), parameter :: VERSIONTAG = ' 05/23/2024' character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG character(len=2), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & @@ -75,16 +75,18 @@ module VersionModule ! -- disclaimer must be appropriate for version (release or release candidate) character(len=*), parameter :: FMTDISCLAIMER = & "(/,& - &'This software is preliminary or provisional and is subject to ',/,& - &'revision. It is being provided to meet the need for timely best ',/,& - &'science. The software has not received final approval by the U.S. ',/,& - &'Geological Survey (USGS). No warranty, expressed or implied, is made ',/,& - &'by the USGS or the U.S. Government as to the functionality of the ',/,& - &'software and related material nor shall the fact of release ',/,& - &'constitute any such warranty. The software is provided on the ',/,& - &'condition that neither the USGS nor the U.S. Government shall be held ',/,& - &'liable for any damages resulting from the authorized or unauthorized ',/,& - &'use of the software.',/)" + &'This software has been approved for release by the U.S. Geological ',/,& + &'Survey (USGS). Although the software has been subjected to rigorous ',/,& + &'review, the USGS reserves the right to update the software as needed ',/,& + &'pursuant to further analysis and review. No warranty, expressed or ',/,& + &'implied, is made by the USGS or the U.S. Government as to the ',/,& + &'functionality of the software and related material nor shall the ',/,& + &'fact of release constitute any such warranty. Furthermore, the ',/,& + &'software is released on condition that neither the USGS nor the U.S. ',/,& + &'Government shall be held liable for any damages resulting from its ',/,& + &'authorized or unauthorized use. Also refer to the USGS Water ',/,& + &'Resources Software User Rights Notice for complete use, copyright, ',/,& + &'and distribution information.',/)" contains diff --git a/version.txt b/version.txt index 393ba97a6cb..4be2c727ad9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6.5.0.dev2 +6.5.0 \ No newline at end of file