Merge branch 'dmap' into '24.0'

DataModelAthenaPool: remove legacy job options

See merge request atlas/athena!70696

Control/DataModelAthenaPool/CMakeLists.txt

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( DataModelAthenaPool )
@@ -25,10 +25,6 @@ atlas_add_dictionary( DataModelAthenaPoolDictDict
                       DataModelAthenaPool/selection.xml
                       LINK_LIBRARIES DataModelAthenaPoolLib )
 
-# Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/DataModelAthenaPool_jobOptions.py )
-
 # Tests in the package:
 function( _add_test name )
    atlas_add_test( ${name}

Control/DataModelAthenaPool/python/DataModelCompatSvc.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#
-# $Id: DataModelCompatSvc.py,v 1.2 2008-03-26 19:23:06 ssnyder Exp $
-#
-# File: python/DataModelCompatSvc.py
-# Author: scott snyder
-# Date: Dec 2007, from previous JO version.
-# Purpose: Set up backwards compatibility for DataModel.
-#
-# Just import this module to set up DataModelCompatSvc.
-#
-
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ServiceMgr
-from DataModelAthenaPool.DataModelAthenaPoolConf import DataModelCompatSvc
-
-# We need this service created explicitly, and we need to make
-# sure that it is initialized before the input file is opened.
-class DataModelCompatSvcCreate (DataModelCompatSvc):
-    def setup (self):
-        DataModelCompatSvc.setup (self)
-        theApp.getHandle()._svcmgr.addService ("", "DataModelCompatSvc", 5)
-        return
-ServiceMgr += DataModelCompatSvcCreate("DataModelCompatSvc")
-

Control/DataModelAthenaPool/share/DataModelAthenaPool_jobOptions.py

-#
-# $Id: DataModelAthenaPool_jobOptions.py,v 1.5 2007-12-10 20:28:09 ssnyder Exp $
-#
-# File: share/DataModelAthenaPool_jobOptions.py
-# Author: scott snyder
-# Date: Nov 2005
-# Purpose: Set up backwards compatibility for DataModel.
-#
-
-include.block ( "DataModelAthenaPool/DataModelAthenaPool_jobOptions.py" )
-
-from DataModelAthenaPool import DataModelCompatSvc