From 61342afae1409814a35cfa9c62c5292d236cb187 Mon Sep 17 00:00:00 2001 From: Brent Huisman Date: Thu, 10 Aug 2023 16:40:39 +0200 Subject: [PATCH] as per docs --- CHANGELOG.md | 2 +- CITATION.bib | 10 +++++----- VERSION | 2 +- doc/contrib/release.rst | 8 +++++--- doc/index.rst | 6 ++++++ pyproject.toml | 2 +- scripts/check-all-tags.sh | 4 ++-- spack/package.py | 5 +++++ 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26a3d153a2..c32763dda5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,7 +103,7 @@ After much more delay than anticipated, we are very happy to present a new Arbor ## New Contributors * @musicinmybrain made their first contribution in https://github.com/arbor-sim/arbor/pull/2080 -**Full Changelog**: https://github.com/arbor-sim/arbor/compare/v0.8...v0.9.0-rc +**Full Changelog**: https://github.com/arbor-sim/arbor/compare/v0.8.1...v0.9.0 # v0.8.1 diff --git a/CITATION.bib b/CITATION.bib index e271888207..e1aebee193 100644 --- a/CITATION.bib +++ b/CITATION.bib @@ -32,11 +32,11 @@ @software{nora_abi_akar_2022_7473671 Simon Frasch and Lukas Drescher and Lennart Landsmeer}, - title = {Arbor Library v0.8.1}, + title = {Arbor Library v0.9.0}, month = nov, year = 2022, publisher = {Zenodo}, - version = {v0.8}, - doi = {10.5281/zenodo.7473671}, - url = {https://doi.org/10.5281/zenodo.7473671} -} \ No newline at end of file + version = {v0.9.0}, + doi = {10.5281/zenodo.8233847}, + url = {https://doi.org/10.5281/zenodo.8233847} +} diff --git a/VERSION b/VERSION index ac39a106c4..dc9bff91aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.0 +0.9.1-dev diff --git a/doc/contrib/release.rst b/doc/contrib/release.rst index 5213bb50d8..c970005d0e 100644 --- a/doc/contrib/release.rst +++ b/doc/contrib/release.rst @@ -93,7 +93,7 @@ Release #. Upload to pypi & verify - Get the wheels from test PyPI or the Github Action that produced the release artifacts. + Get the wheels from test PyPI or the Github Action that produced the release artifacts. Make sure you have pip installed ``twine`` and have your ``~/.pypirc`` file setup with the right token (see `docs `_). .. code-block:: bash @@ -106,7 +106,9 @@ Release #. Create Github Release: https://github.com/arbor-sim/arbor/releases - The Github action that produced the release artifacts should have prepared a draft Release. - - If not: + - Update body text with ``CHANGELOG.md`` + - (Probably: delete the Github draft release for the ``-rc``) + - If no Github Release was automatically drafted: - 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). - Manually build full tarball: @@ -118,7 +120,7 @@ Release Post Release ------------ -#. Start a new release on Zenodo, this allocated a DOI, but you don't have to finish it right away. Add new Zenodo badge/link to docs/README. +#. Start a new release on Zenodo, this allocated a DOI, but you don't have to finish it right away. Add new Zenodo DOI badge/link to ``CITATION.bib`` and ``docs/index.rst``. #. Update Zenodo with authors and changelog created in previous step and submit. diff --git a/doc/index.rst b/doc/index.rst index 1e054f8e1d..be701d974e 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -54,6 +54,9 @@ The Arbor software can be cited by version via Zenodo or via Arbors introductory Latest version |zlatest| +Version 0.9.0 + |z090| + Version 0.8.1 |z081| @@ -92,6 +95,9 @@ Cite (Bibtex format) .. |zlatest| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1459678.svg :target: https://doi.org/10.5281/zenodo.1459678 +.. |z090| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.8233847.svg + :target: https://doi.org/10.5281/zenodo.8233847 + .. |z081| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7473671.svg :target: https://doi.org/10.5281/zenodo.7473671 diff --git a/pyproject.toml b/pyproject.toml index 7194cd2e81..567ab517d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "arbor" -version = "0.9.0" # TODO: make dependent on VERSION file. Blocked by https://github.com/scikit-build/scikit-build-core/issues/230 +version = "0.9.1-dev" # TODO: make dependent on VERSION file. Blocked by https://github.com/scikit-build/scikit-build-core/issues/230 readme = {file = "README.md", content-type = "text/markdown"} license = {file = "LICENSE"} description = "High performance simulation of networks of multicompartment neurons." diff --git a/scripts/check-all-tags.sh b/scripts/check-all-tags.sh index 57e9553aae..9a27d8fbfd 100755 --- a/scripts/check-all-tags.sh +++ b/scripts/check-all-tags.sh @@ -13,7 +13,7 @@ PREFIX="${1:-} `pwd`/build/bin" cxx=/usr/local/opt/llvm/bin/clang++ cc=/usr/local/opt/llvm/bin/clang -for tag in v0.4 v0.5.2 v0.6 v0.7 v0.8 v0.8.1 +for tag in v0.4 v0.5.2 v0.6 v0.7 v0.8 v0.8.1 v0.9.0 do echo "Version=$tag" rm -rf ext/* @@ -54,7 +54,7 @@ check () { fi } -for tag in "v0.4-79855b66" "v0.5.2-51e35898" "v0.6-930c23eb" "v0.7-d0e424b4" "v0.8-8e82ec1" "v0.8.1-c683a1f" +for tag in "v0.4-79855b66" "v0.5.2-51e35898" "v0.6-930c23eb" "v0.7-d0e424b4" "v0.8-8e82ec1" "v0.8.1-c683a1f" "v0.9.0-217c776" do echo "Version=$tag" for simd in ON OFF diff --git a/spack/package.py b/spack/package.py index 5bfc2df590..5531976276 100644 --- a/spack/package.py +++ b/spack/package.py @@ -17,6 +17,11 @@ class Arbor(CMakePackage, CudaPackage): version("master", branch="master") version("develop") + version( + "0.9.0", + sha256="5f9740955c821aca81e23298c17ad64f33f635756ad9b4a0c1444710f564306a", + url="https://github.com/arbor-sim/arbor/releases/download/v0.9.0/arbor-v0.9.0-full.tar.gz", + ) version( "0.8.1", sha256="caebf96676ace6a9c50436541c420ca4bb53f0639dcab825de6fa370aacf6baa",