Skip to content

Commit

Permalink
Submodule conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mollybsmith-noaa committed Jan 22, 2024
2 parents 0ab3731 + 79e0145 commit 91e6884
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ updates:
pull-request-branch-name:
separator: "-" # Use "-" instead of "/" in branch names to avoid issues with docker registries
target-branch: "development" # raise PRs for version updates to GHA against the `development` branch
assignees:
- "ian-noaa"
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Build"
name: "Build METexpress"
on:
push:
branches: [main, development]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prune-untagged-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: snok/[email protected]
with:
image-names: metexpress/development/${{ matrix.app }}
cut-off: 1 day ago MST
cut-off: 1 week ago MST
account-type: org
org-name: dtcenter
untagged-only: true
Expand Down
2 changes: 1 addition & 1 deletion MATScommon
9 changes: 4 additions & 5 deletions docs/Users_Guide/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ When applicable, release notes are followed by the GitHub issue number which des
enhancement, or new feature (`METexpress GitHub issues <https://github.com/dtcenter/METexpress/issues>`_).
Important issues are listed **in bold** for emphasis.

METexpress Version 5.1.2 release notes (20230915)
METexpress Version 5.2.2 release notes (20240126)
-------------------------------------------------

.. dropdown:: Repository, build, and test
Expand All @@ -22,16 +22,15 @@ METexpress Version 5.1.2 release notes (20230915)

.. dropdown:: Bugfixes

* Fixed bug causing rainbow performance diagrams.
* Fixed bug causing pop-out windows to not open in apps whose names contain a slash.
* Improved handling of datestrings.

.. dropdown:: Enhancements

* None.
* Updated all apps to Meteor v2.14.

.. dropdown:: Miscellaneous

* METexpress app container size is no longer huge.
* None

METexpress Upgrade Instructions
===============================
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
# To rotate this list of authors for each official release,
# move the first author to the end of the list
CURRENT_AUTHORS = [
'Bonny Strong',
'Matthew Wandishin',
'Molly Smith',
'Randy Pierce'
'Jeff Hamilton',
'Natalie Babij',
'Ian McGinnis',
'Gopa Padmanabhan',
'Bonny Strong',
]

# list of former contributors who are no longer involved with the project
Expand Down Expand Up @@ -61,13 +61,13 @@
author_list = ', '.join(formatted_authors)

# The stable version, displayed on the front page of the PDF
version = '5.2.1'
version = '5.2.2'
verinfo = version

# The full version, including alpha/beta/rc tags
release = f'{version}'
release_year = '2024'
release_date = f'{release_year}0112'
release_date = f'{release_year}0126'
copyright = f'{release_year}, {author}'
release_monthyear = datetime.strptime(release_date, '%Y%m%d').strftime('%B %Y')

Expand Down

0 comments on commit 91e6884

Please sign in to comment.