From b42d98bc6f2c987022227032cf2380fbb4df455a Mon Sep 17 00:00:00 2001
From: Rosen Matev <rosen.matev@cern.ch>
Date: Thu, 28 Oct 2021 15:47:25 +0200
Subject: [PATCH] Prepare DaVinci v54r1
---
CMakeLists.txt | 2 +-
ReleaseNotes/release_notes_template.md | 6 ++--
ReleaseNotes/v54r1.md | 39 ++++++++++++++++++++++++++
cmake/DaVinciDependencies.cmake | 2 +-
4 files changed, 44 insertions(+), 5 deletions(-)
create mode 100644 ReleaseNotes/v54r1.md
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbac8f457..8e8dda904 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@
cmake_minimum_required(VERSION 3.15)
-project(DaVinci VERSION 54.0
+project(DaVinci VERSION 54.1
LANGUAGES CXX)
# Enable testing with CTest/CDash
diff --git a/ReleaseNotes/release_notes_template.md b/ReleaseNotes/release_notes_template.md
index 18f2eac1a..08bcdabe9 100644
--- a/ReleaseNotes/release_notes_template.md
+++ b/ReleaseNotes/release_notes_template.md
@@ -1,6 +1,6 @@
{% set categories = [
- 'selection', 'hlt1', 'hlt2', 'Configuration',
- 'Decoding', 'Tracking', 'PV finding', 'Muon', 'Calo', 'RICH', 'Jets',
+ 'Configuration',
+ 'Decoding', 'Tracking', 'PV finding', 'VP', 'UT', 'FT', 'Muon', 'Calo', 'RICH', 'Jets',
'PID', 'Composites', 'Filters', 'Functors',
'Event model', 'Persistency',
'MC checking', 'Monitoring', 'Luminosity',
@@ -28,7 +28,7 @@ This version uses
{{project_deps|last}}.
This version is released on `master` branch.
-Built relative to {{project}} [{{project_prev_tag}}](../-/tags/{{project_prev_tag}}), with the following changes:
+Built relative to {{project}} [{{project_prev_tag}}](/../../tags/{{project_prev_tag}}), with the following changes:
### New features ~"new feature"
diff --git a/ReleaseNotes/v54r1.md b/ReleaseNotes/v54r1.md
new file mode 100644
index 000000000..f178399bb
--- /dev/null
+++ b/ReleaseNotes/v54r1.md
@@ -0,0 +1,39 @@
+2021-10-28 DaVinci v54r1
+===
+
+This version uses
+Analysis [v34r1](../../../../Analysis/-/tags/v34r1),
+Phys [v33r3](../../../../Phys/-/tags/v33r3),
+Rec [v33r3](../../../../Rec/-/tags/v33r3),
+Lbcom [v33r4](../../../../Lbcom/-/tags/v33r4),
+LHCb [v53r4](../../../../LHCb/-/tags/v53r4),
+Gaudi [v36r2](../../../../Gaudi/-/tags/v36r2) and
+LCG [101](http://lcginfo.cern.ch/release/101/) with ROOT 6.24.06.
+
+This version is released on `master` branch.
+Built relative to DaVinci [v54r0](/../../tags/v54r0), with the following changes:
+
+### New features ~"new feature"
+
+- ~Configuration | Make the new DaVinci working with ProdConf, !580 (@dfazzini)
+- RefBot going live!, !581 (@chasse)
+
+### Fixes ~"bug fix" ~workaround
+
+- ~Configuration | Resolve "test_davinci_tupling_advanced always runs into timeout", !572 (@dfazzini) [#8]
+
+### Enhancements ~enhancement
+
+- ~Tuples | Update tupling example to accommodate changes in FunctorCollection, !566 (@mferrill) [#15]
+
+### Code cleanups and changes to tests ~modernisation ~cleanup ~testing
+
+- ~Configuration | Resolve "Tupling test running on spruced output", !573 (@dfazzini) [#6]
+- ~Configuration | Remove old davinci configurable and related tests, !568 (@dfazzini)
+- ~Configuration | Resolve "Avoid use of environment variables", !567 (@dfazzini) [#7]
+- ~Configuration | Lint/clean-up/fix new configuration, !564 (@erodrigu)
+- ~Tuples | Remove DecayTreeTuple, !554 (@pkoppenb) [lhcb-dpa/project#7]
+- Follow changes in LHCb!3260, !578 (@graven)
+- Reference update for Phys!968, !570 (@lmeyerga)
+- Adapt test to ProbNN functors, !549 (@pkoppenb)
+- Lint all Python files in the project, !576 (@erodrigu)
diff --git a/cmake/DaVinciDependencies.cmake b/cmake/DaVinciDependencies.cmake
index ae160ab41..5a9a301b6 100644
--- a/cmake/DaVinciDependencies.cmake
+++ b/cmake/DaVinciDependencies.cmake
@@ -22,7 +22,7 @@ if(NOT COMMAND lhcb_find_package)
endif()
# -- Public dependencies
-lhcb_find_package(Analysis 34.0 REQUIRED)
+lhcb_find_package(Analysis REQUIRED)
find_data_package(AppConfig 3.0 REQUIRED)
find_data_package(FieldMap 5.0 REQUIRED)
--
GitLab