From 5269d3f9d9786e52d56e1db50da09c65539d0b1d Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Mon, 18 Mar 2024 10:04:02 +0100 Subject: [PATCH 1/2] update_version.py: fix handling of empty change log --- utils/update_version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/update_version.py b/utils/update_version.py index 7f7cd031c6..6c7d3bf452 100755 --- a/utils/update_version.py +++ b/utils/update_version.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 ##################################################################################### -# (c) Copyright 2023 CERN for the benefit of the LHCb and ATLAS collaborations # +# (c) Copyright 2023-2024 CERN for the benefit of the LHCb and ATLAS collaborations # # # # This software is distributed under the terms of the Apache version 2 licence, # # copied verbatim in the file "LICENSE". # @@ -144,7 +144,7 @@ def update_changelog(fields: Fields) -> tuple[str, list[str], list[str]]: if refs.strip() else f"- {msg.strip()}\n" for change in changes - for msg, refs in [change.split("<=>", 1)] + for msg, refs in ([change.split("<=>", 1)] if "<=>" in change else []) ] filename = "CHANGELOG.md" -- GitLab From 5a2e2c9621744650ee6928f36f5c407c2f294225 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Mon, 18 Mar 2024 10:04:52 +0100 Subject: [PATCH 2/2] Update version to 38.2 --- CMakeLists.txt | 2 +- docs/source/conf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 330554e2f7..a248e03714 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ Maintainer's guide: `<https://twiki.cern.ch/twiki/bin/view/LHCb/MaintainGaudiCMa cmake_minimum_required(VERSION 3.15) -project(Gaudi VERSION 38.1 +project(Gaudi VERSION 38.2 LANGUAGES CXX DESCRIPTION "Gaudi Software Framework" HOMEPAGE_URL "https://cern.ch/gaudi") diff --git a/docs/source/conf.py b/docs/source/conf.py index 850073d316..f42468c473 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,9 +22,9 @@ copyright = "1998-2023, CERN for the benefit of the LHCb and ATLAS collaboration author = "The Gaudi Developers" # The short X.Y version -version = "38.1" +version = "38.2" # The full version, including alpha/beta/rc tags -release = "v38r1" +release = "v38r2" # -- General configuration --------------------------------------------------- -- GitLab