From 3aeea7e2815df4cb508d9fac92048c6f62a6d416 Mon Sep 17 00:00:00 2001
From: Brent Huisman <brenthuisman@users.noreply.github.com>
Date: Wed, 20 Jul 2022 10:49:57 +0200
Subject: [PATCH] v0.7 post release (#1925)

---
 CITATION.bib            | 18 ++++++++++--------
 VERSION                 |  2 +-
 doc/contrib/release.rst | 31 +++++++++++++++++--------------
 doc/index.rst           |  6 ++++++
 spack/package.py        |  9 +++++++--
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/CITATION.bib b/CITATION.bib
index 60539fa3..1887b7b6 100644
--- a/CITATION.bib
+++ b/CITATION.bib
@@ -7,8 +7,8 @@
     pages={274--282},
     doi={10.1109/EMPDP.2019.8671560},
     ISSN={2377-5750}}
-
-@software{nora_abi_akar_2022_5910151,
+    
+@software{nora_abi_akar_2022_6865725,
   author       = {Nora Abi Akar and
                   John Biddiscombe and
                   Benjamin Cumming and
@@ -27,12 +27,14 @@
                   Sebastian Schmitt and
                   Felix Huber and
                   Max Engelen and
-                  Fabian Bösch},
-  title        = {Arbor Library v0.6},
-  month        = jan,
+                  Fabian Bösch and
+                  Jannik Luboeinski and
+                  Simon Frasch},
+  title        = {Arbor Library v0.7},
+  month        = jul,
   year         = 2022,
   publisher    = {Zenodo},
-  version      = {v0.6},
-  doi          = {10.5281/zenodo.5910151},
-  url          = {https://doi.org/10.5281/zenodo.5910151}
+  version      = {v0.7},
+  doi          = {10.5281/zenodo.6865725},
+  url          = {https://doi.org/10.5281/zenodo.6865725}
 }
diff --git a/VERSION b/VERSION
index eb49d7c7..c0ab4272 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7
+0.7.1-dev
diff --git a/doc/contrib/release.rst b/doc/contrib/release.rst
index bd354a03..a1571430 100644
--- a/doc/contrib/release.rst
+++ b/doc/contrib/release.rst
@@ -81,6 +81,16 @@ Release
    - on cmdline: ``git tag -a TAGNAME``
    - ``git push upstream TAGNAME``
 
+#. Upload to pypi & verify
+
+   .. code-block:: bash
+
+      twine upload -r arborpypi dist/*
+
+      python -m venv env && source env/bin/activate
+      pip install arbor
+      python -c 'import arbor; print(arbor.__config__)'
+
 #. Create tarball with
    ``scripts/create_tarball ~/loc/of/arbor tagname outputfile``
 
@@ -100,16 +110,15 @@ Release
    - Go to `GH tags`_ and click “…” and “Create release”
    - Categorize/edit Github's autogenerated release notes (alternatively go through merged PRs to come up with a changelog).
    - add tarball to release, created in previous step.
+   
+#. Update Zenodo with authors and changelog created in previous step and submit.
 
-#. Upload to pypi & verify
-
-   .. code-block:: bash
-
-      twine upload -r arborpypi dist/*
+Post Release
+------------
 
-      python -m venv env && source env/bin/activate
-      pip install arbor
-      python -c 'import arbor; print(arbor.__config__)'
+#. Make a new PR setting ``VERSION`` to the next with a trailing ``-dev``. E.g. if you just release ``3.14``, change ``VERSION`` to ``3.15-dev``
+    
+   - Include changes such as to ``spack/package.py``, ``CITATIONS``, ``doc/index.rst`` in postrel PR. Copy Zenodo BibTex export to ``CITATIONS``.
 
 #. Update spack package / Ebrains Lab / Opensourcebrain
 
@@ -119,12 +128,6 @@ Release
 
      - Make sure that `Notebooks <https://www.v2.opensourcebrain.org/repositories/38>`_ work on the version that their image is built with.
 
-
-Post Release
-------------
-
-#. Make a new PR setting ``VERSION`` to the next with a trailing ``-dev``. E.g. if you just release ``3.14``, change ``VERSION`` to ``3.15-dev``
-#. Update and submit Zenodo release if necessary.
 #. Announce on our website
 #. Announce on HBP newsletter newsletter@humanbrainproject.eu, HBP Twitter/socials evan.hancock@ebrains.eu
 #. [AUTOMATED] Add tagged version of docs on ReadTheDocs
diff --git a/doc/index.rst b/doc/index.rst
index 5fdb1bb0..194955a5 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -48,6 +48,9 @@ The Arbor software can be cited by version via Zenodo or via Arbors introductory
 Latest version
     |zlatest|
 
+Version 0.7
+    |z07|
+
 Version 0.6
     |z06|
 
@@ -77,6 +80,9 @@ Cite (Bibtex format)
 .. |zlatest| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1459678.svg
     :target: https://doi.org/10.5281/zenodo.1459678
 
+.. |z07| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.6865725.svg
+    :target: https://doi.org/10.5281/zenodo.6865725
+    
 .. |z06| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5910151.svg
     :target: https://doi.org/10.5281/zenodo.5910151
 
diff --git a/spack/package.py b/spack/package.py
index c5028e59..56791d87 100644
--- a/spack/package.py
+++ b/spack/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Arbor(CMakePackage, CudaPackage):
@@ -12,10 +12,15 @@ class Arbor(CMakePackage, CudaPackage):
 
     homepage = "https://arbor-sim.org"
     git = "https://github.com/arbor-sim/arbor.git"
-    url = "https://github.com/arbor-sim/arbor/releases/download/v0.6/arbor-v0.6-full.tar.gz"
+    url = "https://github.com/arbor-sim/arbor/releases/download/v0.7/arbor-v0.7-full.tar.gz"
     maintainers = ["bcumming", "brenthuisman", "haampie", "schmitts"]
 
     version("master", branch="master", submodules=True)
+    version(
+        "0.7",
+        sha256="c3a6b7193946aee882bb85f9c38beac74209842ee94e80840968997ba3b84543",
+        url="https://github.com/arbor-sim/arbor/releases/download/v0.7/arbor-v0.7-full.tar.gz",
+    )
     version(
         "0.6",
         sha256="4cd333b18effc8833428ddc0b99e7dc976804771bc85da90034c272c7019e1e8",
-- 
GitLab