[BuildRules] cleanup PYTHON27; use python3 as default

cms-sw · Jul 18, 2021 · d135cfa · d135cfa
1 parent 0225c42
commit d135cfa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 38 deletions.
diff --git a/cmssw-tool.file b/cmssw-tool.file
diff --git a/cmssw-toolfile.spec b/cmssw-toolfile.spec
@@ -19,7 +19,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cmssw.xml
   <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CMSSW_BASE/biglib/$SCRAM_ARCH" type="path"/>
   <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/>
   <runtime name="PATH"       value="$CMSSW_BINDIR" type="path"/>
-  <runtime name="PYTHON27PATH" value="$LIBDIR" type="path"/>
   <runtime name="PYTHON3PATH" value="$LIBDIR" type="path"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$CMSSW_BASE/src" type="path"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$CMSSW_BASE/include/$SCRAM_ARCH/include" type="path" handler="warn"/>

diff --git a/coral-tool.file b/coral-tool.file
diff --git a/scram-project-build.file b/scram-project-build.file
@@ -53,7 +53,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V06-02-23
+%define configtag       V06-03-00
 %endif
 
 %if "%{?cvssrc:set}" != "set"

diff --git a/scramv1-tool-conf.file b/scramv1-tool-conf.file
@@ -96,16 +96,17 @@ if [ -e $SCRAMV1_ROOT/bin/chktool ] ; then
   rm -f %i/errors.log
 fi
 
-py27List=`echo ${PYTHON27PATH} | tr ':' '\n'`
-
-mkdir -p %{i}/${PYTHON_LIB_SITE_PACKAGES}
-touch %{i}/${PYTHON_LIB_SITE_PACKAGES}/tool-deps.pth
-for pkg in ${py27List} ; do
-   echo "adding $pkg"
-   echo "$pkg" >> %{i}/${PYTHON_LIB_SITE_PACKAGES}/tool-deps.pth
-done
 echo '<tool name="python-paths" version="1.0">' > %{i}/tools/selected/python-paths.xml
-echo '  <runtime name="PYTHON27PATH"  value="%{i}/'${PYTHON_LIB_SITE_PACKAGES}'" type="path"/>' >> %{i}/tools/selected/python-paths.xml
+if [ "${PYTHON27PATH}" != "" ] ; then
+  py27List=`echo ${PYTHON27PATH} | tr ':' '\n'`
+  mkdir -p %{i}/${PYTHON_LIB_SITE_PACKAGES}
+  touch %{i}/${PYTHON_LIB_SITE_PACKAGES}/tool-deps.pth
+  for pkg in ${py27List} ; do
+     echo "adding $pkg"
+     echo "$pkg" >> %{i}/${PYTHON_LIB_SITE_PACKAGES}/tool-deps.pth
+  done
+  echo '  <runtime name="PYTHON27PATH"  value="%{i}/'${PYTHON_LIB_SITE_PACKAGES}'" type="path"/>' >> %{i}/tools/selected/python-paths.xml
+fi
 
 if [ "${PYTHON3PATH}" != "" ] ; then
   py3List=`echo ${PYTHON3PATH} | tr ':' '\n'`