Merge remote-tracking branch 'upstream/master'

5cd8eceb · Stefan Roiser · 1e8843a8 · aeb156f0 · 5cd8eceb · 5cd8eceb
Commit 5cd8eceb authored 6 years ago by Stefan Roiser
--- a/.gitignore
+++ b/.gitignore
+# backup files
 *~
-*.pyc
 .*.swp

-build.*.log
-Makefile
-NMake
-install.*.history
-setup.*
-cleanup.*
-version.cmt
-genConf/
-QMTest/
+# build products
 InstallArea/
-patches/
-test_results/

-*-slc[56]-*/
-i686-winxp-vc9-dbg/
+# Centrally managed files and helpers
+cache_preload.cmake

-.*-slc[56]-*.d/
-.i686-winxp-vc9-dbg.d/
+# CMake temporary files
+build*/
+.build/
+CMakeFiles/
+CTestTestfile.cmake
+CPackSourceConfig.cmake
+CPackConfig.cmake
+cmake_install.cmake

+# common byproducts
+*.pyc
+*.pyo
 DoxyWarnings.log
 .gdb_history
 *.new
+.coverage
+*.patch
 *.launch
 *.launch.py
 *.launch.opts

+# QMTest byproducts
+**/tests/qmtest/*
+!**/tests/qmtest/*.qms
+!**/tests/qmtest/*.qmt
+
+# Metadata used by IDEs
+# - Eclipse
 .project
 .cproject
 .settings
 .pydevproject
-.vscode
-
-.build/
-build-dir/
-build.*/
 .eclipse/
-CMakeFiles/
-CTestTestfile.cmake
-CPackSourceConfig.cmake
-CPackConfig.cmake
-cmake_install.cmake
-GaudiConfig.cmake
-GaudiConfigVersion.cmake
-Gaudi/ChangeLog
-GaudiAlg/ChangeLog
-GaudiAud/ChangeLog
-GaudiCommonSvc/ChangeLog
-GaudiCoreSvc/ChangeLog
-GaudiExamples/ChangeLog
-GaudiGSL/ChangeLog
-GaudiKernel/ChangeLog
-GaudiMonitor/ChangeLog
-GaudiMP/ChangeLog
-GaudiPartProp/ChangeLog
-GaudiPolicy/ChangeLog
-GaudiProfiling/ChangeLog
-GaudiPython/ChangeLog
-GaudiRelease/ChangeLog
-GaudiSvc/ChangeLog
-GaudiSys/ChangeLog
-GaudiUtils/ChangeLog
-PartPropSvc/ChangeLog
-RootCnv/ChangeLog
-RootHistCnv/ChangeLog
-ChangeLog
+# - QtCreator
+CMakeLists.txt.user
+# - VSCode
+.vscode/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ image: gitlab-registry.cern.ch/lhcb-core/lbdocker/centos7-build
 variables:
  NO_LBLOGIN: "1"
  TARGET_BRANCH: master
-  BINARY_TAG: x86_64-centos7-gcc7-opt
+  BINARY_TAG: x86_64-centos7-gcc8-opt
  BUILDDIR: build-opt
  TESTS_REPORT: "test_report"
  LCG_hostos: "x86_64-centos7"
@@ -16,12 +16,12 @@ variables:
  LCG_contrib: "/cvmfs/sft.cern.ch/lcg/contrib"
  CCACHE_VERSION: "3.3.4-e92e5"

-build:gcc7:opt:
+build:gcc8:opt:
  stage: build
  tags:
    - cvmfs
  variables:
-    BINARY_TAG: x86_64-centos7-gcc7-opt
+    BINARY_TAG: x86_64-centos7-gcc8-opt
    BUILDDIR: build-opt
  script:
    - ci-utils/build
@@ -31,12 +31,12 @@ build:gcc7:opt:
      - .ccache
    expire_in: 1 week

-build:gcc7:dbg:
+build:gcc8:dbg:
  stage: build
  tags:
    - cvmfs
  variables:
-    BINARY_TAG: x86_64-centos7-gcc7-dbg
+    BINARY_TAG: x86_64-centos7-gcc8-dbg
    BUILDDIR: build-dbg
  script:
    - ci-utils/build
@@ -46,21 +46,6 @@ build:gcc7:dbg:
      - .ccache
    expire_in: 1 week

-build:gcc62:opt:
-  stage: build
-  tags:
-    - cvmfs
-  variables:
-    BINARY_TAG: x86_64-centos7-gcc62-opt
-    BUILDDIR: build-gcc62
-  script:
-    - ci-utils/build
-  artifacts:
-    paths:
-      - ${BUILDDIR}
-      - .ccache
-    expire_in: 1 week
-
 check-formatting:
  stage: build
  dependencies: []
@@ -78,14 +63,14 @@ check-formatting:
 doxygen:
  stage: test
  dependencies:
-    - build:gcc7:opt
+    - build:gcc8:opt
  tags:
    - cvmfs
  only:
    - master
    - tags
  variables:
-    BINARY_TAG: x86_64-centos7-gcc7-opt
+    BINARY_TAG: x86_64-centos7-gcc8-opt
    BUILDDIR: build-opt
  script:
    - . ci-utils/env_setup.sh
@@ -100,14 +85,14 @@ doxygen:
      - public
    expire_in: 1 day

-test:gcc7:opt:
+test:gcc8:opt:
  stage: test
  dependencies:
-    - build:gcc7:opt
+    - build:gcc8:opt
  tags:
    - cvmfs
  variables:
-    BINARY_TAG: x86_64-centos7-gcc7-opt
+    BINARY_TAG: x86_64-centos7-gcc8-opt
    BUILDDIR: build-opt
  script:
    - ci-utils/test
@@ -117,14 +102,14 @@ test:gcc7:opt:
    when: always
    expire_in: 1 week

-test:gcc7:dbg:
+test:gcc8:dbg:
  stage: test
  dependencies:
-    - build:gcc7:dbg
+    - build:gcc8:dbg
  tags:
    - cvmfs
  variables:
-    BINARY_TAG: x86_64-centos7-gcc7-dbg
+    BINARY_TAG: x86_64-centos7-gcc8-dbg
    BUILDDIR: build-dbg
  script:
    - ci-utils/test
@@ -134,32 +119,14 @@ test:gcc7:dbg:
    when: always
    expire_in: 1 week

-test:gcc62:opt:
-  stage: test
-  dependencies:
-    - build:gcc62:opt
-  tags:
-    - cvmfs
-  variables:
-    BINARY_TAG: x86_64-centos7-gcc62-opt
-    BUILDDIR: build-gcc62
-    TESTS_REPORT: test_report-gcc62
-  script:
-    - ci-utils/test
-  artifacts:
-    paths:
-      - ${TESTS_REPORT}
-    when: always
-    expire_in: 1 week
-
 test_public_headers_build:
  stage: test
  dependencies:
-    - build:gcc7:opt
+    - build:gcc8:opt
  tags:
    - cvmfs
  variables:
-    BINARY_TAG: x86_64-centos7-gcc7-opt
+    BINARY_TAG: x86_64-centos7-gcc8-opt
    BUILDDIR: build-opt
  script:
    - ci-utils/test_public_headers_build

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,60 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

 ## [Unreleased][]

+## [v31r0][] - 2019-02-11
+The main reason for this major release is to the change of the `Algorithm` base
+class with a re-entrant `execute` method (#47, !703). For backward compatibility the
+base class for algorithms is `Gaudi::Algorithm`, while the name `Algorithm` in
+the top level namespace is used for a backward compatible implementation. This
+change also required a backward incompatible change in the `IAlgorithm`
+interface, so some code may require adaptation.
+
+We also took the occasion to update the version of `clang-format` we use from
+3.9 to 7, and to switch Python formatting from `autopep8` to `yapf` (!788).
+Because of the differences (fixes and new features) in the versions of
+`clang-format`, we also updated the style rules.
+
+As of this version, Gaudi requires C++17 compatible compiler.
+C++14 compatibility is not required in merge requests, nor guaranteed on the
+_master_ branch.
+
+On top of that, we have the usual collection of minor fixes and improvements.
+
+### Changed
+- Use gcc 8 instead of gcc 7, and drop gcc 6.2 in CI jobs (!836)
+- Make new counters work with Gaudi::Algorithm (#57, !834, !839)
+- Update clang-format version and style rules (!788)
+- Make `DataObjectHandle::{put,getOrCreate}` const (!833)
+- Simplify IAlgExecStateSvc interface (!775)
+- Simplify Algorithm constructor (!766)
+- Improve the scheduler's execution flow simulator and fix the intra-event occupancy logger (!819)
+- Reentrant Algorithm base class (#47, !703)
+
+### Added
+- Introduced `CPUCrunchSvc` (!840)
+- Added a boolean parameter to turn on verbose view algorithm status (!835)
+- Added `MsgStream` support for counters (!826)
+- Message: Add option to print full event ID (!824)
+- IoComponentMgr: Add interface to retrieve all filenames of component (!823)
+- Add example for `Consumer<void()>` (!797)
+
+### Fixed
+- Fix lookup/use of `nosetests` for LCG 95 (!842)
+- Check coding conventions in _build_ stage of Gitlab-CI (!848)
+- Make `gaudi_add_compile_test` also work for succeeding compilations (!844)
+- Fix build of Gaudi with LCG 95rc1 in ATLAS context (!847)
+- Explicitly define `StatusCode` constants (!841)
+- Fix handling of `EventContext` in `Gaudi::Functional::Transformer` arguments (!837)
+- `Extensions` to allow `EventIDRanges` limited by both time-stamps and run/LB pairs (!831)
+- Improve ROOT dictionary dependency computation (!825)
+- Fix issues in preparation for LCG 95 (!820)
+- Improve QMT test wrapper (!812)
+- Improvements for tests (!812, !817)
+- Fixes/workrounds for thread-safety (!815, !829)
+- Code clean up (!808, !811, !814, !809, !827, !843)
+- Fixes to thread local initialization (!816, !807)
+
+
 ## [v30r5][] - 2018-11-15
 This release is mainly to revert !462 (Reimplemenation of `DataHandle`), which
 caused problems in ATLAS code.
@@ -188,8 +242,9 @@ Details about old versions of the project can be found in the
 [GaudiRelease/doc](GaudiRelease/doc).


-[Unreleased]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v30r5...master
-[v30r5]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v30r5...v30r5
+[Unreleased]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v31r0...master
+[v31r0]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v30r5...v31r0
+[v30r5]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v30r4...v30r5
 [v30r4]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v30r3...v30r4
 [v30r3]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v30r2...v30r3
 [v29r4]: https://gitlab.cern.ch/gaudi/Gaudi/compare/v29r3...v29r4

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 include(${CMAKE_SOURCE_DIR}/cmake/externals.cmake)

 # Declare project name and version
-gaudi_project(Gaudi v30r5)
+gaudi_project(Gaudi v31r0)

 # These tests do not really fit in a subdirectory.
 add_test(NAME cmake.CMakeModules

--- a/GaudiRelease/doc/release.notes.v31r0.md
+++ b/GaudiRelease/doc/release.notes.v31r0.md
+---
+version: v31r0
+date: 2019-02-11
+supported_builds: [CMake]
+---
+Package Coordinators: Marco Clemencic, Charles Leggett
+
+# Release Notes
+The main reason for this major release is to the change of the `Algorithm` base
+class with a re-entrant `execute` method ([#47](https://gitlab.cern.ch/gaudi/Gaudi/issues/47), [!703](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/703)). For backward compatibility the
+base class for algorithms is `Gaudi::Algorithm`, while the name `Algorithm` in
+the top level namespace is used for a backward compatible implementation. This
+change also required a backward incompatible change in the `IAlgorithm`
+interface, so some code may require adaptation.
+
+We also took the occasion to update the version of `clang-format` we use from
+3.9 to 7, and to switch Python formatting from `autopep8` to `yapf` ([!788](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/788)).
+Because of the differences (fixes and new features) in the versions of
+`clang-format`, we also updated the style rules.
+
+As of this version, Gaudi requires C++17 compatible compiler.
+C++14 compatibility is not required in merge requests, nor guaranteed on the
+_master_ branch.
+
+On top of that, we have the usual collection of minor fixes and improvements.
+
+### Changed
+- Use gcc 8 instead of gcc 7, and drop gcc 6.2 in CI jobs ([!836](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/836))
+- Make new counters work with Gaudi::Algorithm ([#57](https://gitlab.cern.ch/gaudi/Gaudi/issues/57), [!834](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/834), [!839](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/839))
+- Update clang-format version and style rules ([!788](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/788))
+- Make `DataObjectHandle::{put,getOrCreate}` const ([!833](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/833))
+- Simplify IAlgExecStateSvc interface ([!775](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/775))
+- Simplify Algorithm constructor ([!766](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/766))
+- Improve the scheduler's execution flow simulator and fix the intra-event occupancy logger ([!819](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/819))
+- Reentrant Algorithm base class ([#47](https://gitlab.cern.ch/gaudi/Gaudi/issues/47), [!703](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/703))
+
+### Added
+- Introduced `CPUCrunchSvc` ([!840](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/840))
+- Added a boolean parameter to turn on verbose view algorithm status ([!835](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/835))
+- Added `MsgStream` support for counters ([!826](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/826))
+- Message: Add option to print full event ID ([!824](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/824))
+- IoComponentMgr: Add interface to retrieve all filenames of component ([!823](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/823))
+- Add example for `Consumer<void()>` ([!797](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/797))
+
+### Fixed
+- Fix lookup/use of `nosetests` for LCG 95 ([!842](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/842))
+- Check coding conventions in _build_ stage of Gitlab-CI ([!848](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/848))
+- Make `gaudi_add_compile_test` also work for succeeding compilations ([!844](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/844))
+- Fix build of Gaudi with LCG 95rc1 in ATLAS context ([!847](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/847))
+- Explicitly define `StatusCode` constants ([!841](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/841))
+- Fix handling of `EventContext` in `Gaudi::Functional::Transformer` arguments ([!837](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/837))
+- `Extensions` to allow `EventIDRanges` limited by both time-stamps and run/LB pairs ([!831](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/831))
+- Improve ROOT dictionary dependency computation ([!825](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/825))
+- Fix issues in preparation for LCG 95 ([!820](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/820))
+- Improve QMT test wrapper ([!812](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/812))
+- Improvements for tests ([!812](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/812), [!817](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/817))
+- Fixes/workrounds for thread-safety ([!815](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/815), [!829](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/829))
+- Code clean up ([!808](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/808), [!811](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/811), [!814](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/814), [!809](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/809), [!827](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/827), [!843](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/843))
+- Fixes to thread local initialization ([!816](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/816), [!807](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/807))
--- a/ReleaseNotes/v31r0.md
+++ b/ReleaseNotes/v31r0.md
+---
+version: v31r0
+date: 2019-02-11
+supported_builds: [CMake]
+---
+Package Coordinators: Marco Clemencic, Charles Leggett
+
+# Release Notes
+The main reason for this major release is to the change of the `Algorithm` base
+class with a re-entrant `execute` method ([#47](https://gitlab.cern.ch/gaudi/Gaudi/issues/47), [!703](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/703)). For backward compatibility the
+base class for algorithms is `Gaudi::Algorithm`, while the name `Algorithm` in
+the top level namespace is used for a backward compatible implementation. This
+change also required a backward incompatible change in the `IAlgorithm`
+interface, so some code may require adaptation.
+
+We also took the occasion to update the version of `clang-format` we use from
+3.9 to 7, and to switch Python formatting from `autopep8` to `yapf` ([!788](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/788)).
+Because of the differences (fixes and new features) in the versions of
+`clang-format`, we also updated the style rules.
+
+As of this version, Gaudi requires C++17 compatible compiler.
+C++14 compatibility is not required in merge requests, nor guaranteed on the
+_master_ branch.
+
+On top of that, we have the usual collection of minor fixes and improvements.
+
+### Changed
+- Use gcc 8 instead of gcc 7, and drop gcc 6.2 in CI jobs ([!836](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/836))
+- Make new counters work with Gaudi::Algorithm ([#57](https://gitlab.cern.ch/gaudi/Gaudi/issues/57), [!834](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/834), [!839](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/839))
+- Update clang-format version and style rules ([!788](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/788))
+- Make `DataObjectHandle::{put,getOrCreate}` const ([!833](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/833))
+- Simplify IAlgExecStateSvc interface ([!775](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/775))
+- Simplify Algorithm constructor ([!766](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/766))
+- Improve the scheduler's execution flow simulator and fix the intra-event occupancy logger ([!819](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/819))
+- Reentrant Algorithm base class ([#47](https://gitlab.cern.ch/gaudi/Gaudi/issues/47), [!703](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/703))
+
+### Added
+- Introduced `CPUCrunchSvc` ([!840](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/840))
+- Added a boolean parameter to turn on verbose view algorithm status ([!835](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/835))
+- Added `MsgStream` support for counters ([!826](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/826))
+- Message: Add option to print full event ID ([!824](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/824))
+- IoComponentMgr: Add interface to retrieve all filenames of component ([!823](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/823))
+- Add example for `Consumer<void()>` ([!797](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/797))
+
+### Fixed
+- Fix lookup/use of `nosetests` for LCG 95 ([!842](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/842))
+- Check coding conventions in _build_ stage of Gitlab-CI ([!848](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/848))
+- Make `gaudi_add_compile_test` also work for succeeding compilations ([!844](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/844))
+- Fix build of Gaudi with LCG 95rc1 in ATLAS context ([!847](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/847))
+- Explicitly define `StatusCode` constants ([!841](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/841))
+- Fix handling of `EventContext` in `Gaudi::Functional::Transformer` arguments ([!837](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/837))
+- `Extensions` to allow `EventIDRanges` limited by both time-stamps and run/LB pairs ([!831](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/831))
+- Improve ROOT dictionary dependency computation ([!825](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/825))
+- Fix issues in preparation for LCG 95 ([!820](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/820))
+- Improve QMT test wrapper ([!812](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/812))
+- Improvements for tests ([!812](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/812), [!817](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/817))
+- Fixes/workrounds for thread-safety ([!815](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/815), [!829](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/829))
+- Code clean up ([!808](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/808), [!811](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/811), [!814](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/814), [!809](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/809), [!827](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/827), [!843](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/843))
+- Fixes to thread local initialization ([!816](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/816), [!807](https://gitlab.cern.ch/gaudi/Gaudi/merge_requests/807))
--- a/ci-utils/env_setup.sh
+++ b/ci-utils/env_setup.sh
 # default values for some variables defined in .gitlab-ci.yml
 : ${TARGET_BRANCH:=master}

-: ${BINARY_TAG:=x86_64-centos7-gcc7-opt}
+: ${BINARY_TAG:=x86_64-centos7-gcc8-opt}
 : ${BUILDDIR:=build.${BINARY_TAG}}
 : ${TESTS_REPORT:=test_report}

@@ -15,7 +15,7 @@
 # - get Python, nosetests and xenv from LHCb installation
 source /cvmfs/lhcb.cern.ch/lib/var/lib/LbEnv/prod/${LCG_hostos}/bin/activate
 # - add CMake ann Ninja-build
-export PATH=${LCG_contrib}/CMake/3.11.1/Linux-x86_64/bin:${LCG_contrib}/ninja/1.7.2.gcc0ea.kitware.dyndep-1/x86_64-slc6:${PATH}
+export PATH=${LCG_contrib}/CMake/3.13.4/Linux-x86_64/bin:${LCG_contrib}/ninja/1.7.2.gcc0ea.kitware.dyndep-1/x86_64-slc6:${PATH}
 # - use LHCb compiler wrappers
 export PATH=/cvmfs/lhcb.cern.ch/lib/bin/${LCG_hostos}:${PATH}
 # - enable optional VTune based profiler

--- a/cmake/GaudiProjectConfig.cmake
+++ b/cmake/GaudiProjectConfig.cmake
@@ -63,6 +63,9 @@ find_program(clang_format_cmd
        clang-format-${CLANG_FORMAT_VERSION})
 if(clang_format_cmd)
  message(STATUS "found clang-format ${CLANG_FORMAT_VERSION}: ${clang_format_cmd}")
+else()
+  message(WARNING "could not find clang-format ${CLANG_FORMAT_VERSION}:
+  automatic formatting of C++ files will not be possible")
 endif()

 set(YAPF_VERSION "0.24.0" CACHE STRING "Version of yapf to use")
@@ -81,6 +84,9 @@ if(NOT yapf_cmd)
 endif()
 if(yapf_cmd)
  message(STATUS "found yapf ${YAPF_VERSION}: ${yapf_cmd}")
+else()
+  message(WARNING "could not find yapf ${YAPF_VERSION}:
+  automatic formatting of Python files will not be possible")
 endif()

 mark_as_advanced(ccache_cmd distcc_cmd icecc_cmd clang_format_cmd)

--- a/toolchain.cmake
+++ b/toolchain.cmake
 # Special wrapper to load the declared version of the heptools toolchain.
-set(heptools_version 94)
+set(heptools_version 95)

 cmake_minimum_required(VERSION 3.6)
 if($ENV{HEPTOOLS_VERSION})