Skip to content

Commit

Permalink
Finalising v1.4.0 release (#335)
Browse files Browse the repository at this point in the history
* Version number bump, CHANGELOG update for release

* CITATION.cff update

* Use raw strings for regex in release script

* Drop extra "v" when build script checks euphonic.__version__

The optional v is now included in euphonic.__version__ so we don't
have to add it (again!) for consistency with other locations.
  • Loading branch information
ajjackson authored Dec 5, 2024
1 parent 47d89ef commit 3feac5c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
`Unreleased <https://github.com/pace-neutrons/Euphonic/compare/v1.3.2...HEAD>`_
`Unreleased <https://github.com/pace-neutrons/Euphonic/compare/v1.4.0...HEAD>`_
-------------------------------------------------------------------------------

`v1.4.0 <https://github.com/pace-neutrons/Euphonic/compare/v1.3.2...v1.4.0>`_
-----------------------------------------------------------------------------

This release includes some significant modernisation and maintenance,
as well as new features and performance enhancements.

- Requirements

- Python 3.8, 3.9 is no longer supported
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ authors:
given-names: "Jacob S."
title: "Euphonic"
doi: 10.5286/SOFTWARE/EUPHONIC
version: 1.3.2
version: 1.4.0
date-released: 2024-01-30
license: GPL-3.0-only
repository-code: https://github.com/pace-neutrons/Euphonic
Expand Down
6 changes: 3 additions & 3 deletions build_utils/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def release_github(test=True):
with open('CITATION.cff') as f:
citation = yaml.safe_load(f)

euphonic_ver = 'v' + __version__
euphonic_ver = __version__
version_dict = {}
version_dict['CHANGELOG.rst'] = re.findall('\n`(v\d+\.\d+\.\S+)\s',
version_dict['CHANGELOG.rst'] = re.findall(r'\n`(v\d+\.\d+\.\S+)\s',
changelog)[0]
version_dict['CITATION.cff'] = 'v' + citation['version']
for ver_name, ver in version_dict.items():
Expand All @@ -35,7 +35,7 @@ def release_github(test=True):
f'euphonic.__version__: {euphonic_ver} {ver_name}: '
f'{ver}'))

desc = re.search('`v\d+\.\d+\.\S+.*?^-+\n(.*?)^`v', changelog,
desc = re.search(r'`v\d+\.\d+\.\S+.*?^-+\n(.*?)^`v', changelog,
re.DOTALL | re.MULTILINE).groups()[0].strip()
payload = {
"tag_name": euphonic_ver,
Expand Down
2 changes: 1 addition & 1 deletion euphonic/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "v1.3.1a1"
__version__ = "v1.4.0"

0 comments on commit 3feac5c

Please sign in to comment.