Merge pull request #1285 from KrisThielemans/prepv5.2.0

Prepare for v5.2.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+<!-- Fill in most of this text, and delete what is not appropriate.
+Please read and adhere to the [contribution guidelines](https://github.com/UCL/STIR/blob/master/CONTRIBUTING.md).
+Did you sign the STIR Contribution License Agreement?
+-->
+
+## Changes in this pull request
+
+
+## Testing performed
+
+
+## Related issues
+<!-- Use keywords such as "fixes", "closes", see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue -->
+
+
+## Checklist before requesting a review
+<!--Put an x between the [] when completed. Delete a line if not applicable. -->
+  - [] I have performed a self-review of my code
+  - [] I have added docstrings/doxygen in line with the guidance in the developer guide
+  - [] I have implemented unit tests that cover any new or modified functionality (if applicable)
+  - [] The code builds and runs on my machine
+  - [] `documentation/release_XXX.md` has been updated with any functionality change (if applicable)

.mailmap

@@ -45,8 +45,10 @@ Palak Wadhwa <[email protected]> <[email protected]>
 Rebecca Gillen <[email protected]> <[email protected]>
 Richard Brown <[email protected]> <[email protected]>
 Richard Brown <[email protected]>  <[email protected]>
-Robert Twyman <[email protected]> <[email protected]>
-Robert Twyman <[email protected]> <[email protected]>
+Robert Twyman Skelly <[email protected]> <[email protected]>
+Robert Twyman Skelly <[email protected]> <[email protected]>
+Robert Twyman Skelly <[email protected]> <[email protected]>
+Robert Twyman Skelly <[email protected]> <[email protected]>
 Yu-jung Tsai <[email protected]> <[email protected]>
 Gemma Fardell <[email protected]> <[email protected]>
 Gemma Fardell <[email protected]> <[email protected]>
@@ -62,5 +64,6 @@ Nicole Jurjew <[email protected]>
 Tahereh Niknejad <[email protected]>
 Tahereh Niknejad <[email protected]> <[email protected]>
 Sam D Porter <[email protected]>
+Sam D Porter <[email protected]>  <[email protected]>
 Matthew Strugari <[email protected]>
 Matthew Strugari <[email protected]> <[email protected]>

CITATION.cff

@@ -18,31 +18,34 @@ authors:
       given-names:  Richard
       orcid:        'https://orcid.org/0000-0001-6989-9200'
       affiliation:  University College London
+    - family-names: Twyman Skelly
+      given-names:  Robert
+      affiliation:  University College London and Prescient Imaging
     - family-names: Tsoumpas
       given-names:  Charalampos
-    - family-names: Twyman
-      given-names:  Robert
-      affiliation:  University College London
     - family-names: Deidda
       given-names:  Daniel
       orcid:        'https://orcid.org/0000-0002-2766-4339'
       affiliation:  National Physics Laboratory (UK)
+    - family-names: Falcon
+      given-names:  Carles
     - family-names: Borgeaud
       given-names:  Tim
       affiliation:  Hammersmith Imanet Ltd
-    - family-names: Falcon
-      given-names:  Carles
     - family-names: Khateri
       given-names:  Parisa
       affiliation:  ETH Zuerich
+    - family-names: Jehl
+      given-names:  Markus
+      affiliation:  Positrigo
     - family-names: Wadhwa
       given-names:  Palak
       affiliation:  University of Leeds (UK)
-    - family-names: Beisel
-      given-names:  Tobias
     - family-names: Strugari
       given-names:  Matthew
       affiliation:  Dalhousie University (Canada)
+    - family-names: Beisel
+      given-names:  Tobias
     - family-names: Jacobson
       given-names:  Matthew
     - family-names: Gillman
@@ -69,9 +72,6 @@ authors:
     - family-names: Fischer
       given-names:  Jannis
       orcid:        'https://orcid.org/0000-0002-8329-0220'
-    - family-names: Jehl
-      given-names:  Markus
-      affiliation:  Positrigo
     - family-names: Roethlisberger
       given-names:  Michael
       affiliation:  ETH Zuerich
@@ -80,13 +80,17 @@ authors:
     - family-names: Brusaferri
       given-names:  Ludovica
       affiliation:  University College London
-    - family-names: Bertolli
-      given-names:  Ottavia
-      affiliation:  University College London
     - family-names: Pasca
       given-names:  Edoardo
       affiliation:  UK Research & Innovation
       orcid:        'https://orcid.org/0000-0001-6957-2160'
+    - family-names: Thomas
+      given-names:  Benjamin
+      orcid:        'https://orcid.org/0000-0002-9784-1177'
+      affiliation:  University College London
+    - family-names: Bertolli
+      given-names:  Ottavia
+      affiliation:  University College London
     - family-names: Niknejad
       given-names:  Tahereh
     - family-names: Dikaios
@@ -113,10 +117,6 @@ authors:
     - family-names: Valente
       given-names:  Patrick
       affiliation:  Brunel University (UK)
-    - family-names: Thomas
-      given-names:  Benjamin
-      orcid:        'https://orcid.org/0000-0002-9784-1177'
-      affiliation:  University College London
     - family-names: Schramm
       given-names:  Georg
       affiliation:  Katholieke Universiteit Leuven (Belgium)
@@ -143,12 +143,12 @@ authors:
     - family-names: Mikhaylova
       given-names:  Ekaterina
       affiliation:  Positrigo
-    - family-names: da Costa-Luis
-      given-names:  Casper O.
-      orcid:        'https://orcid.org/0000-0002-7211-1557'
     - family-names: Porter
       given-names:  Sam David
       affiliation:  University College London, National Physics Laboratory (UK)
+    - family-names: da Costa-Luis
+      given-names:  Casper O.
+      orcid:        'https://orcid.org/0000-0002-7211-1557'
     - family-names: Rashidnasab
       given-names:  Alaleh
       affiliation:  University College London
@@ -160,11 +160,11 @@ authors:
       affiliation:  University College London
     - family-names: Vavrek
       given-names:  Jayson
-    - family-names: Kohr
-      given-names:  Holger
     - family-names: Tsai
       given-names:  Yu-jung
       affiliation:  University College London
+    - family-names: Kohr
+      given-names:  Holger
     - name: tokkot
     - family-names: El Katib
       given-names:  Mahmoud

CMakeLists.txt

@@ -56,9 +56,9 @@ endif()
 
 ####### Set Version number etc
 set(VERSION_MAJOR   5)
-set(VERSION_MINOR   1)
-set(VERSION_PATCH   2)
-set(VERSION   050102) # only used in STIRConfig.h.in
+set(VERSION_MINOR   2)
+set(VERSION_PATCH   0)
+set(VERSION   050200) # only used in STIRConfig.h.in
 
 set(STIR_VERSION
   ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})

CONTRIBUTING.md

@@ -44,7 +44,6 @@ Please by mindful about the resources used by our Continuous Integration (CI) wo
   - Use specific keywords in the first line of the last commit that you push to prevent CI being run:
      - `[ci skip]` skips all CI runs (e.g. when you only change documentation, or when your update isn't ready yet)
      - `[actions skip]` does not run GitHub Actions, see [here](https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/). Note: this can be in the main commit message.
-     - `[travis skip]` does not run Travis-CI, see [here](https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build). Note: this can be in the main commit message.
      - `[skip appveyor]` does not run Appveyor, see [here](https://www.appveyor.com/docs/how-to/filtering-commits/#skip-directive-in-commit-message)
 8. After acceptance of your PR, go home with a nice warm feeling.
 

VERSION.txt

@@ -1 +1 @@
-5.1.2
+5.2.0