Skip to content

Commit

Permalink
Merge pull request #2117 from MODFLOW-USGS/post-release-6.6.0-reset
Browse files Browse the repository at this point in the history
Post release 6.6.0 reset
  • Loading branch information
wpbonelli authored Dec 20, 2024
2 parents 9a123d3 + a07ec3c commit 298a4b2
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 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.dev0"
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
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
a platform for supporting multiple models and multiple types of models within the
Expand Down
2 changes: 1 addition & 1 deletion 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.dev0 (preliminary)
### 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
4 changes: 2 additions & 2 deletions code.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"email": "[email protected]"
},
"laborHours": -1,
"version": "6.6.0.dev0",
"version": "6.7.0.dev0",
"date": {
"metadataLastUpdated": "2024-05-23"
"metadataLastUpdated": "2024-12-19"
},
"organization": "U.S. Geological Survey",
"permissions": {
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...May 23, 2024 16:39:07
__version__ = "6.6.0.dev0"
# created on...December 19, 2024 20:40:15
__version__ = "6.7.0.dev0"
4 changes: 2 additions & 2 deletions doc/version.tex
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\newcommand{\modflowversion}{mf6.6.0.dev0}
\newcommand{\modflowdate}{May 23, 2024}
\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.dev0',
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.dev0"
version = "6.7.0.dev0"

[dependencies]
appdirs = "*"
Expand Down
4 changes: 2 additions & 2 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.dev0'
character(len=*), parameter :: VERSIONTAG = ' (preliminary) 05/23/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
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.6.0.dev0
6.7.0.dev0

0 comments on commit 298a4b2

Please sign in to comment.