Skip to content

Commit

Permalink
Merge pull request #486 from mala-project/master
Browse files Browse the repository at this point in the history
Update develop from release
  • Loading branch information
RandomDefaultUser authored Sep 28, 2023
2 parents 22bcefb + 04e4d2d commit 3b138ff
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.1.0
current_version = 1.2.0
commit = True
tag = True
sign_tags = True
Expand Down
6 changes: 3 additions & 3 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# YAML 1.2
cff-version: 1.1.0
cff-version: 1.2.0
message: "If you use this software, please cite it using these metadata."
authors:
- affiliation: "Center for Advanced Systems Understanding (CASUS), Helmholtz-Zentrum Dresden-Rossendorf e.V. (HZDR)"
Expand Down Expand Up @@ -83,12 +83,12 @@ authors:
given-names: D. Jon


date-released: 2022-10-18
date-released: 2023-09-28
keywords:
- "machine-learning"
- "dft"
license: "BSD-3-Clause"
repository-code: "https://github.com/mala-project/mala"
title: MALA
doi: 10.5281/zenodo.5557254 # This DOI represents all versions, and will always resolve to the latest one.
version: 1.1.0
version: 1.2.0
2 changes: 1 addition & 1 deletion Copyright.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
************************************************************************

MALA v. 1.1.0
MALA v. 1.2.0

Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
Expand Down
2 changes: 1 addition & 1 deletion mala/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Version number of MALA."""

__version__: str = '1.1.0'
__version__: str = '1.2.0'

0 comments on commit 3b138ff

Please sign in to comment.