Merge branch 'v12r3-release' into 'run2-patches'

Release notes and dependencies for v12r3

See merge request !137

CMakeLists.txt

@@ -16,8 +16,8 @@ find_package(GaudiProject)
 #---------------------------------------------------------------
 
 # Declare project name and version
-gaudi_project(Alignment v12r1
-              USE  Phys v26r4
+gaudi_project(Alignment v12r3
+              USE  Phys v26r5
               DATA AppConfig
                    FieldMap
                    ParamFiles)

ReleaseNotes/release_notes_template.md

-{% set used = [] -%}
-{% macro section(labels) -%}
-{% for mr in select_mrs(merge_requests, labels, used) %}
-- {{mr.title}}, !{{mr.iid}} (@{{mr.author.username}}) {{find_tasks(mr)}}  
-  {{mr.description|mdindent(2)}}
-{% endfor %}
-{%- endmacro %}
-
+{% set categories = [
+    'selection', 'hlt1', 'hlt2', 'Configuration',
+    'Decoding', 'Tracking', 'PV finding', 'Muon', 'Calo', 'RICH', 'Jets',
+    'PID', 'Composites', 'Filters', 'Functors',
+    'Event model', 'Persistency',
+    'MC checking', 'Monitoring', 'Luminosity',
+    'Core', 'Conditions', 'Utilities',
+    'Simulation',  'Tuples', 'Accelerators',
+    'Flavour tagging',
+    'Build',
+    ] -%}
+{% set used_mrs = [] -%}
+{% set used_dep_mrs = [] -%}
+{% set highlight_mrs = select_mrs(get_dep_mrs(), ['highlight']) -%}
+{% macro section(labels, mrs=merge_requests, used=used_mrs, indent='', highlight='highlight') -%}
+{% for mr in order_by_label(select_mrs(mrs, labels, used), categories) -%}
+  {% set mr_labels = categories|select("in", mr.labels)|list -%}
+{{indent}}- {% if mr_labels %}{{mr_labels|map('label_ref')|join(' ')}} | {% endif -%}
+    {{mr.title|sentence}}, {{mr|mr_ref(project_fullname)}} (@{{mr.author.username}}){% if mr.issue_refs %} [{{mr.issue_refs|join(',')}}]{% endif %}{% if highlight in mr.labels %} :star:{% endif %}
+{# {{mr.description|mdindent(2)}} -#}
+{% endfor -%}
+{% endmacro -%}
 {{date}} {{project}} {{version}}
 ===
 
-This version uses Lbcom v22r0, LHCb v44r0, Gaudi v29r3 and LCG_93 with ROOT 6.12.06
-<p>
-This version is released on `2018-patches` branch.
+This version uses
+{{project_deps[:-1]|join(',\n')}} and
+{{project_deps|last}}.
+
+This version is a placeholder for alignment improvements relevant to Run 1/2 that took place after the end of Run 2.
+Built relative to {{project}} [{{project_prev_tag}}](../-/tags/{{project_prev_tag}}), with the following changes:
+
+### New features ~"new feature"
 
-Built relative to Rec v22r1, with the following changes:
+{{ section(['new feature']) -}}
+- Upstream project highlights :star:
+{{ section(['new feature'], mrs=highlight_mrs, used=used_dep_mrs, indent='  ', highlight=None) }}
 
-### New features
-{{ section(['new feature']) }}
+### Fixes ~"bug fix" ~workaround
 
-### Enhancements
-{{ section(['enhancement']) }}
+{{ section(['bug fix', 'workaround']) -}}
+- Upstream project highlights :star:
+{{ section(['bug fix', 'workaround'], mrs=highlight_mrs, used=used_dep_mrs, indent='  ', highlight=None) }}
 
-### Bug fixes
-{{ section(['bug fix']) }}
+### Enhancements ~enhancement
 
-### Code modernisations and cleanups
-{{ section(['cleanup', 'modernisation']) }}
+{{ section(['enhancement']) -}}
+- Upstream project highlights :star:
+{{ section(['enhancement'], mrs=highlight_mrs, used=used_dep_mrs, indent='  ', highlight=None) }}
 
-### Monitoring changes
-{{ section(['monitoring']) }}
+### Code cleanups and changes to tests ~modernisation ~cleanup ~testing
 
-### Changes to tests
-{{ section(['testing']) }}
+{{ section(['cleanup', 'modernisation', 'testing']) -}}
+- Upstream project highlights :star:
+{{ section(['cleanup'], mrs=highlight_mrs, used=used_dep_mrs, indent='  ', highlight=None) }}
+
+### Documentation ~Documentation
+
+{# Collect documentation independently, may lead to repeated entries -#}
+{{ section(['Documentation'], used=None) -}}
+{# Mark as used such documentation does not appear under Other -#}
+{% set dummy = section(['Documentation']) -%}
 
 ### Other
+
 {{ section([[]]) }}

ReleaseNotes/v12r3.md

+2020-08-13 Alignment v12r3
+===
+
+This version uses
+Phys [v26r5](../../../../Phys/-/tags/v26r5),
+Rec [v24r4](../../../../Rec/-/tags/v24r4),
+Lbcom [v23r0p4](../../../../Lbcom/-/tags/v23r0p4),
+LHCb [v45r4](../../../../LHCb/-/tags/v45r4),
+Gaudi [v33r2](../../../../Gaudi/-/tags/v33r2) and
+LCG [97a](http://lcginfo.cern.ch/release/97a/) with ROOT 6.20.06.
+
+This version contains all changes used in production in 2018 (unreleased at the time) and any improvements relevant to Run 1/2 that took place after the end of Run 2.
+Built relative to Alignment [v12r1](../-/tags/v12r1), with the following changes:
+
+
+### Enhancements ~enhancement
+
+- ~Configuration | Various commits to the satelite area to be propagated to 2018-patches, !75 (@gdujany)
+- ~Configuration ~Build | Fixes for run2-patches, !125 (@wouter)
+- ~Build | Add missing OTDet dependency, exposed by LHCb!2047, !98 (@cattanem)
+- Satellite v12r1, !81 (@gdujany)
+
+
+### Code cleanups and changes to tests ~modernisation ~cleanup ~testing
+
+- ~Configuration | Remove Upgrade option, !111 (@cattanem)
+- ~Conditions | GetElementsToBeAligned: remove upgrade detectors, !110 (@cattanem)
+- ~Build | Remove WIN32 dead code, !121 (@cattanem)
+- ~Build | Remove obsolete CMT files and directories, !120 (@cattanem)
+- ~Build | Ignore unchecked status codes, !115 (@clemenci)
+- ~Build | Replace GaudiObjDesc generation with committed files, !102 (@clemenci) [LHCBPS-1845]
+- ~Build | Remove obsolete and no longer valid LbcomSys and RecSys dependencies, !80 (@gdujany)
+- Add copyright and formatting to run2-patches, !95 (@clemenci) [LHCBPS-1838]
+- Fix compilation warnings as in !73, !94 (@cattanem)
+- Fix gcc7 compilation warnings exposed by gaudi/Gaudi!408, !93 (@cattanem)
+- Backward compatible changes required for Gaudi/master, !92 (@clemenci) [LHCBPS-1827,LHCBPS-1831]
+- Fix for more strict StatusCode implementation, !91 (@cattanem) [LHCBPS-1831]
+- Update test references to follow Piecewise trajectory bug fix, LHCb!1711, !88 (@cattanem)
+- Updating references, !82 (@devieira)
+- Update test reference to follow Rec!1105, !71 (@cattanem)