Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post release 6.6.0 reset #2117

Merged
merged 4 commits into from
Dec 20, 2024
Merged

Post release 6.6.0 reset #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61db0a5
ci(release): update version to 6.6.0
github-actions[bot] Dec 20, 2024
51f0009
chore(release): touch up dates
wpbonelli Dec 20, 2024
799088c
Merge pull request #2116 from MODFLOW-USGS/v6.6.0
wpbonelli Dec 20, 2024
a07ec3c
ci(release): update version to 6.7.0.dev0
wpbonelli Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .build_rtd_docs/Doxyfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.6.0.dev0
6.7.0.dev0
Loading