Skip to content

Commit

Permalink
ci(release): update version to 6.7.0.dev0
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Dec 20, 2024
1 parent 799088c commit a07ec3c
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .build_rtd_docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -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.
19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.

4 changes: 2 additions & 2 deletions code.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"status": "Release",
"status": "Preliminary",
"languages": [
"Fortran2008"
],
Expand All @@ -18,7 +18,7 @@
"email": "[email protected]"
},
"laborHours": -1,
"version": "6.6.0",
"version": "6.7.0.dev0",
"date": {
"metadataLastUpdated": "2024-12-19"
},
Expand Down
4 changes: 2 additions & 2 deletions doc/version.py
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion doc/version.tex
Original file line number Diff line number Diff line change
@@ -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}
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -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 : [
Expand Down
2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
Expand Down
26 changes: 12 additions & 14 deletions src/Utilities/version.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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 = &
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.6.0
6.7.0.dev0

0 comments on commit a07ec3c

Please sign in to comment.