From 61db0a5c17f262f16957a9685667e3e37e49bebc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 01:08:51 +0000 Subject: [PATCH 1/3] ci(release): update version to 6.6.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 | 2 +- src/Utilities/version.f90 | 26 ++++++++++++++------------ version.txt | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/.build_rtd_docs/Doxyfile b/.build_rtd_docs/Doxyfile index e2ee288f100..8a65f959d6a 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.6.0.dev0" +PROJECT_NUMBER = "version 6.6.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 c07210ad7c5..f0520e27d54 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.6.0.dev0 -date-released: '2024-05-23' +version: 6.6.0 +date-released: '2024-12-20' 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 6f21ea88fcc..0c5b1027007 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.6.0.dev0 (preliminary) +### Version 6.6.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 f324cd0ccec..4b610d9c3b1 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.6.0.dev0", + "version": "6.6.0", "date": { - "metadataLastUpdated": "2024-05-23" + "metadataLastUpdated": "2024-12-20" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/version.py b/doc/version.py index 9a5659f56f1..223cfb76c67 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...May 23, 2024 16:39:07 -__version__ = "6.6.0.dev0" +# created on...December 20, 2024 01:08:51 +__version__ = "6.6.0" diff --git a/doc/version.tex b/doc/version.tex index 50137e9a961..8c68946fb69 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.6.0.dev0} -\newcommand{\modflowdate}{May 23, 2024} +\newcommand{\modflowversion}{mf6.6.0} +\newcommand{\modflowdate}{December 20, 2024} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/meson.build b/meson.build index c80643f5cb5..37a77f3ff80 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'MODFLOW 6', 'fortran', - version: '6.6.0.dev0', + version: '6.6.0', license: 'CC0', meson_version: '>= 1.1.0', default_options : [ diff --git a/pixi.toml b/pixi.toml index 6ee06b92fb7..ac0f89e692f 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.6.0.dev0" +version = "6.6.0" [dependencies] appdirs = "*" diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index de7e8b13d95..2ef4cd26a71 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.6.0.dev0' - character(len=*), parameter :: VERSIONTAG = ' (preliminary) 05/23/2024' + character(len=*), parameter :: VERSIONNUMBER = '6.6.0' + character(len=*), parameter :: VERSIONTAG = ' 12/20/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 a6d068245c2..cd802a1ec4e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6.6.0.dev0 \ No newline at end of file +6.6.0 \ No newline at end of file From 51f00094d9d4d8495bdf97ac2722f492ffed7e4a Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Thu, 19 Dec 2024 20:16:36 -0500 Subject: [PATCH 2/3] chore(release): touch up dates --- CITATION.cff | 2 +- code.json | 2 +- doc/version.py | 2 +- doc/version.tex | 2 +- src/Utilities/version.f90 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index f0520e27d54..33414f14ed5 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -3,7 +3,7 @@ message: If you use this software, please cite the software itself. type: software title: MODFLOW 6 Modular Hydrologic Model version: 6.6.0 -date-released: '2024-12-20' +date-released: '2024-12-19' 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/code.json b/code.json index 4b610d9c3b1..5490d558f29 100644 --- a/code.json +++ b/code.json @@ -20,7 +20,7 @@ "laborHours": -1, "version": "6.6.0", "date": { - "metadataLastUpdated": "2024-12-20" + "metadataLastUpdated": "2024-12-19" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/version.py b/doc/version.py index 223cfb76c67..6b18c895df2 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...December 20, 2024 01:08:51 +# created on...December 19, 2024 23:59:59 __version__ = "6.6.0" diff --git a/doc/version.tex b/doc/version.tex index 8c68946fb69..59ebc87dbc7 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ \newcommand{\modflowversion}{mf6.6.0} -\newcommand{\modflowdate}{December 20, 2024} +\newcommand{\modflowdate}{December 19, 2024} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index 2ef4cd26a71..56b071a295d 100644 --- a/src/Utilities/version.f90 +++ b/src/Utilities/version.f90 @@ -18,7 +18,7 @@ module VersionModule ! -- modflow 6 version integer(I4B), parameter :: IDEVELOPMODE = 1 character(len=*), parameter :: VERSIONNUMBER = '6.6.0' - character(len=*), parameter :: VERSIONTAG = ' 12/20/2024' + character(len=*), parameter :: VERSIONTAG = ' 12/19/2024' character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG character(len=2), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & From a07ec3c6f4f1ad743a639e250644e3ffe4146e1f Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Thu, 19 Dec 2024 20:40:30 -0500 Subject: [PATCH 3/3] ci(release): update version to 6.7.0.dev0 --- .build_rtd_docs/Doxyfile | 2 +- CITATION.cff | 2 +- DISCLAIMER.md | 17 ++++++++--------- README.md | 19 +++++++++---------- code.json | 4 ++-- doc/version.py | 4 ++-- doc/version.tex | 2 +- meson.build | 2 +- pixi.toml | 2 +- src/Utilities/version.f90 | 26 ++++++++++++-------------- version.txt | 2 +- 11 files changed, 39 insertions(+), 43 deletions(-) diff --git a/.build_rtd_docs/Doxyfile b/.build_rtd_docs/Doxyfile index 8a65f959d6a..a4511abc92c 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.6.0" +PROJECT_NUMBER = "version 6.7.0.dev0" # 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 33414f14ed5..d13fd7bcd09 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ 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.6.0 +version: 6.7.0.dev0 date-released: '2024-12-19' doi: 10.5066/F76Q1VQV abstract: MODFLOW 6 is an object-oriented program and framework developed to provide diff --git a/DISCLAIMER.md b/DISCLAIMER.md index 9226475a939..f32778cb5e4 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -1,12 +1,11 @@ Disclaimer ---------- -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. +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. diff --git a/README.md b/README.md index 0c5b1027007..2b14d00daeb 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.6.0 +### Version 6.7.0.dev0 (preliminary) [![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,13 +110,12 @@ Citations for specific versions are included with the [releases](https://github. Disclaimer ---------- -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. +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. diff --git a/code.json b/code.json index 5490d558f29..5980a4e821f 100644 --- a/code.json +++ b/code.json @@ -1,6 +1,6 @@ [ { - "status": "Release", + "status": "Preliminary", "languages": [ "Fortran2008" ], @@ -18,7 +18,7 @@ "email": "langevin@usgs.gov" }, "laborHours": -1, - "version": "6.6.0", + "version": "6.7.0.dev0", "date": { "metadataLastUpdated": "2024-12-19" }, diff --git a/doc/version.py b/doc/version.py index 6b18c895df2..b26252f3ec5 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...December 19, 2024 23:59:59 -__version__ = "6.6.0" +# created on...December 19, 2024 20:40:15 +__version__ = "6.7.0.dev0" diff --git a/doc/version.tex b/doc/version.tex index 59ebc87dbc7..bedb3c400c7 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.6.0} +\newcommand{\modflowversion}{mf6.7.0.dev0} \newcommand{\modflowdate}{December 19, 2024} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/meson.build b/meson.build index 37a77f3ff80..52c7849d295 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'MODFLOW 6', 'fortran', - version: '6.6.0', + version: '6.7.0.dev0', license: 'CC0', meson_version: '>= 1.1.0', default_options : [ diff --git a/pixi.toml b/pixi.toml index ac0f89e692f..49541d0a43a 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.6.0" +version = "6.7.0.dev0" [dependencies] appdirs = "*" diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index 56b071a295d..2550c364a4c 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.6.0' - character(len=*), parameter :: VERSIONTAG = ' 12/19/2024' + character(len=*), parameter :: VERSIONNUMBER = '6.7.0.dev0' + character(len=*), parameter :: VERSIONTAG = ' (preliminary) 12/19/2024' character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG character(len=2), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & @@ -75,18 +75,16 @@ module VersionModule ! -- disclaimer must be appropriate for version (release or release candidate) character(len=*), parameter :: FMTDISCLAIMER = & "(/,& - &'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.',/)" + &'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.',/)" contains diff --git a/version.txt b/version.txt index cd802a1ec4e..e38cf193ca0 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6.6.0 \ No newline at end of file +6.7.0.dev0 \ No newline at end of file