From 1025d6ab97c9c6cc64dd8c0edc579835b78f3510 Mon Sep 17 00:00:00 2001
From: Carter Francis <csfrancis@wisc.edu>
Date: Wed, 8 May 2024 23:17:17 -0500
Subject: [PATCH] Prepare: Prepare 0.18.0 release

---
 .zenodo.json          | 18 +++++++++---------
 CHANGELOG.rst         |  2 +-
 pyxem/release_info.py |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.zenodo.json b/.zenodo.json
index f40f07d6a..19f0883ab 100644
--- 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
index 4e9c9b10d..7adde2ce0 100644
--- 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
index 7be7815aa..0e328bbcb 100644
--- a/pyxem/release_info.py
+++ b/pyxem/release_info.py
@@ -1,6 +1,6 @@
 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.
@@ -8,8 +8,8 @@
 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"