Merge pull request #1072 from CSSFrancis/update-before-release

pyxem · May 9, 2024 · a95b113 · a95b113
2 parents f925337 + 1025d6a
commit a95b113
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -7,16 +7,16 @@
       "name":"Phillip Crout",
       "orcid": "0000-0001-5754-0938"
     },
-    {
-      "name":"Magnus Nord",
-      "orcid": "0000-0001-7981-5293",
-      "affiliation": "Norwegian University of Science and Technology"
-    },
     {
       "name":"Carter Francis",
       "orcid": "0000-0003-2564-1851",
       "affiliation": "University of Wisconsin Madison"
     },
+    {
+      "name":"Magnus Nord",
+      "orcid": "0000-0001-7981-5293",
+      "affiliation": "Norwegian University of Science and Technology"
+    },
     {
       "name":"Joonatan Laulainen"
     },
@@ -55,6 +55,10 @@
     {
       "name":"Joseph Broussard"
     },
+    {
+      "name":"Viljar Johan Femoen",
+      "affiliation": "Norwegian University of Science and Technology"
+    },
     {
       "name":"Shuoyuan Huang",
       "orcid":"0009-0008-9826-9425",
@@ -118,10 +122,6 @@
     {
       "name": "Petr Vacek",
       "orcid": "0000-0002-1625-9258"
-    },
-    {
-      "name":"Viljar Johan Femoen",
-      "affiliation": "Norwegian University of Science and Technology"
     }
   ]
 }
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,7 +8,7 @@ The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`
 and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
 
 
-Unreleased
+2024-05-08 - version 0.18.0
 ==========
 Fixed
 -----

diff --git a/pyxem/release_info.py b/pyxem/release_info.py
@@ -1,15 +1,15 @@
 name = "pyxem"
-version = "0.18.dev0"
-author = "Duncan Johnstone, Phillip Crout, Magnus Nord, Carter Francis"
+version = "0.18.0"
+author = "Duncan Johnstone, Phillip Crout, Carter Francis, Magnus Nord"
 copyright = "Copyright 2016-2024, The pyxem developers"
 # Contributors listed by original committer, maintainers, then other
 # within groups organised by  number of commits.
 # See: https://github.com/pyxem/pyxem/graphs/contributors
 credits = [
     "Duncan Johnstone",
     "Phillip Crout",
-    "Magnus Nord",
     "Carter Francis",
+    "Magnus Nord",
     "Joonatan Laulainen",
     "Simon Høgås",
     "Eirik Opheim",
@@ -21,6 +21,7 @@
     "Stef Smeets",
     "Andrew Ross",
     "Joseph Broussard",
+    "Viljar Johan Femoen",
     "Shuoyuan Huang",
     "Sean Collins",
     "Tom Furnival",
@@ -40,7 +41,6 @@
     "Matt von Lany",
     "Rob Tovey",
     "Petr Vacek",
-    "Viljar Johan Femoen",
 ]
 license = "GPLv3+"
 maintainer = "Duncan Johnstone, Phillip Crout, Magnus Nord, Carter Francis"