From a617c4d15c0eab3adbfb4c5a7a2612d25403de07 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 14 Oct 2020 09:22:56 +0200
Subject: [PATCH] PyUtils: remove pygraphviz workaround
---
Tools/PyUtils/CMakeLists.txt | 1 +
Tools/PyUtils/python/scripts/cmake_depends.py | 9 +--------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Tools/PyUtils/CMakeLists.txt b/Tools/PyUtils/CMakeLists.txt
index d2e741fce05..a2035f304db 100644
--- a/Tools/PyUtils/CMakeLists.txt
+++ b/Tools/PyUtils/CMakeLists.txt
@@ -6,6 +6,7 @@ atlas_subdir( PyUtils )
# External dependencies:
find_package( decorator )
find_package( graphviz )
+find_package( pygraphviz )
find_package( requests )
find_package( six )
find_package( ROOT COMPONENTS Core PyROOT Tree MathCore Hist RIO pthread )
diff --git a/Tools/PyUtils/python/scripts/cmake_depends.py b/Tools/PyUtils/python/scripts/cmake_depends.py
index 3a9c6d658d6..0d3d628b068 100644
--- a/Tools/PyUtils/python/scripts/cmake_depends.py
+++ b/Tools/PyUtils/python/scripts/cmake_depends.py
@@ -14,14 +14,7 @@ import re
from collections import deque
import PyUtils.acmdlib as acmdlib
import argparse
-
-# Hack until atlasexternals!747 is deployed:
-try:
- import pygraphviz
-except ImportError:
- import sys
- sys.path.append('/cvmfs/sft.cern.ch/lcg/releases/LCG_98python3/pygraphviz/1.5/'+os.getenv('BINARY_TAG')+'/lib/python3.7/site-packages')
- import pygraphviz
+import pygraphviz
def read_package_list(package_file):
--
GitLab