From e2555b09ad2174282fc01a6f892e2600816df23d Mon Sep 17 00:00:00 2001
From: Tulay Cuhadar Donszelmann <tulay.cuhadar.donszelmann@cern.ch>
Date: Thu, 30 Mar 2017 17:18:44 +0000
Subject: [PATCH] Merge branch 'cmt_cleanup' into '21.0'
Remove CMT layout assumption in ConfiguredFactory (ATEAM-391)
See merge request !638
---
Control/AthenaCommon/cmt/requirements | 39 -------------------
.../AthenaCommon/python/ConfiguredFactory.py | 2 +-
2 files changed, 1 insertion(+), 40 deletions(-)
delete mode 100755 Control/AthenaCommon/cmt/requirements
diff --git a/Control/AthenaCommon/cmt/requirements b/Control/AthenaCommon/cmt/requirements
deleted file mode 100755
index dfb1ecc4365..00000000000
--- a/Control/AthenaCommon/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package AthenaCommon
-
-author Paolo Calafiura <Paolo.Calafiura@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-#use GaudiInterface GaudiInterface-* External
-
-
-# Remove the Gaudi and related external entries from LD_LIBRARY_PATH since
-# InstallArea entries supercede them.
-####path_remove LD_LIBRARY_PATH "/GaudiKernel/"
-
-alias athena athena.py
-alias athena-app athena-app.py
-
-apply_pattern declare_scripts files="\
- athena.py athena.C \
- athena-app.py \
- chappy.py \
- find_cfg_dups.py \
- $(AthenaCommon_root)/test/*.py \
- test_cfg_pickling.py \
-"
-apply_pattern declare_joboptions files=" \
- Bootstrap.py \
- Preparation.py \
- Execution.py \
- Atlas.UnixStandardJob.py \
- Atlas_Gen.UnixStandardJob.py \
- MemTraceInclude.py \
- JobOptTraceInclude.py \
- runbatch.py \
-"
-apply_pattern declare_python_modules files="*.py Utils"
-
-private
-use TestPolicy TestPolicy-*
-
-end_private
diff --git a/Control/AthenaCommon/python/ConfiguredFactory.py b/Control/AthenaCommon/python/ConfiguredFactory.py
index 19c61c285ca..ddb64cf237c 100644
--- a/Control/AthenaCommon/python/ConfiguredFactory.py
+++ b/Control/AthenaCommon/python/ConfiguredFactory.py
@@ -1256,7 +1256,7 @@ class ConfiguredFactory(object):
nFiles = 0
startTime = time.time()
- paths = [p for p in sys.path if p.endswith ('InstallArea/python')]
+ paths = [p for p in sys.path if p.endswith ('/python')]
if not paths: paths = sys.path
for path in paths:
--
GitLab