Skip to content

Commit

Permalink
submodule conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mollybsmith-noaa committed Oct 29, 2024
2 parents 31fa871 + f11cd6d commit df499be
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion MATScommon
13 changes: 6 additions & 7 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.3.3 release notes (20240830)
METexpress Version 5.3.4 release notes (20241101)
-------------------------------------------------

.. dropdown:: Repository, build, and test
Expand All @@ -22,21 +22,20 @@ METexpress Version 5.3.3 release notes (20240830)

.. dropdown:: Bugfixes

* Fixed broken CSV export.
* The axis merge button no longer does anything if there is only one curve.
* Query improvements.

.. dropdown:: Enhancements

* Plots with all null values now display a No Data Found message.
* None.

.. dropdown:: Miscellaneous

* Linted MATScommon.
* None.

METexpress Upgrade Instructions
===============================

METexpress Version 5.3.3 upgrade instructions
METexpress Version 5.3.4 upgrade instructions
---------------------------------------------

Download and deploy the new v5.3.3 docker containers from the dtcenter repository.
Download and deploy the new v5.3.4 docker containers from the dtcenter repository.
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
# To rotate this list of authors for each official release,
# move the first author to the end of the list
CURRENT_AUTHORS = [
'Gopa Padmanabhan',
'Molly Smith',
'Randy Pierce'
'Jeff Hamilton',
'Natalie Babij',
'Ian McGinnis',
'Gopa Padmanabhan',
]

# 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.3.3'
version = '5.3.4'
verinfo = version

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

Expand Down
42 changes: 21 additions & 21 deletions tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"npm-run-all": "^4.1.5",
"wdio-chromedriver-service": "^7.3.1",
"webdriverio": "^7.16.15",
"chromedriver": "^127.0.0"
"chromedriver": "^130.0.0"
},
"dependencies": {
"typescript": "^4.9.5"
Expand Down

0 comments on commit df499be

Please sign in to comment.