Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BuildRules] cleanup PYTHON27; use python3 as default #7146

Merged
merged 1 commit into from
Jul 19, 2021
Merged

[BuildRules] cleanup PYTHON27; use python3 as default #7146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions cmssw-tool.file
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cmssw-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
9 changes: 0 additions & 9 deletions coral-tool.file
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scram-project-build.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
19 changes: 10 additions & 9 deletions scramv1-tool-conf.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'`
Expand Down