Merge branch 'ExternalsUpdate-master-20200727' into 'master'

Externals Update, master branch (2020.07.27.)

Closes ATLINFR-3652

See merge request atlas/athena!35122

Projects/AnalysisBase/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.71
+AnalysisBaseExternalsVersion = 2.0.72

Projects/AthDataQuality/externals.txt

@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.71
+AtlasExternalsVersion = 2.0.72

Projects/AthGeneration/build_externals.sh

@@ -24,7 +24,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
 while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)

Projects/AthGeneration/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.71
+AthGenerationExternalsVersion = 2.0.72
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v33r1.004

Projects/AthSimulation/build_externals.sh

@@ -24,7 +24,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
 while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)

Projects/AthSimulation/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.71
+AthSimulationExternalsVersion = 2.0.72
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v33r1.004

Projects/Athena/CMakeLists.txt

@@ -31,9 +31,9 @@ if( LCG_NIGHTLY )
     set( TDAQ_VERSION "99-00-00" CACHE STRING
        "The version of tdaq to use for the build" )
 else()
-    set( TDAQ-COMMON_VERSION "04-01-01" CACHE STRING
+    set( TDAQ-COMMON_VERSION "04-01-00" CACHE STRING
        "The version of tdaq-common to use for the build" )
-    set( TDAQ_VERSION "09-01-01" CACHE STRING
+    set( TDAQ_VERSION "09-01-00" CACHE STRING
        "The version of tdaq to use for the build" )
 endif()
 
@@ -74,12 +74,6 @@ set( OpenBlasEnvironment_DIR "${CMAKE_SOURCE_DIR}/cmake"
 mark_as_advanced( OpenBlasEnvironment_DIR )
 find_package( OpenBlasEnvironment )
 
-# Set up the runtime environment for NumPy.
-set( NumPyEnvironment_DIR "${CMAKE_SOURCE_DIR}/cmake"
-   CACHE PATH "Directory holding NumPyEnvironmentConfig.cmake" )
-mark_as_advanced( NumPyEnvironment_DIR )
-find_package( NumPyEnvironment )
-
 # Set up where to find the AthenaPoolUtilitiesTest CMake code.
 set( AthenaPoolUtilitiesTest_DIR
    "${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake"

Projects/Athena/build_externals.sh

@@ -24,7 +24,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
 while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)

Projects/Athena/cmake/NumPyEnvironmentConfig.cmake

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-# Module for setting up the runtime environment for numpy from an LCG release.
-#
-
-# Decide whether or not to pass "QUIET" to the subsequent find_package call(s).
-set( _quietFlag )
-if( NumPyEnvironment_FIND_QUIETLY )
-  set( _quietFlag QUIET )
-endif()
-
-# Find the lapack installation that's part of LCG. Note that this call finds the
-# CMake configuration included in the LAPACK installation, it does *not* use
-# CMake's FindLAPACK.cmake module.
-find_package( lapack ${_quietFlag} )
-
-# Extract the path of the library pointed to by the "lapack" imported library.
-if( lapack_FOUND )
-   get_target_property( _configs lapack IMPORTED_CONFIGURATIONS )
-   list( GET _configs 0 _config )
-   get_target_property( _libPath lapack IMPORTED_LOCATION_${_config} )
-   get_filename_component( NumPyEnvironment_LIBRARY_DIRS ${_libPath}
-      DIRECTORY )
-   unset( _configs )
-   unset( _config )
-   unset( _libPath )
-endif()

Projects/Athena/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.71
+AthenaExternalsVersion = 2.0.72
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v33r1.004

Projects/VP1Light/build_externals.sh

@@ -26,7 +26,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
 while getopts ":t:b:fch" opt; do
     case $opt in
         t)

Projects/VP1Light/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.71
+VP1LightExternalsVersion = 2.0.72