diff --git a/py2-future.spec b/archive/py2-future.spec similarity index 100% rename from py2-future.spec rename to archive/py2-future.spec diff --git a/python.spec b/archive/python.spec similarity index 100% rename from python.spec rename to archive/python.spec diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 43630a5d052..348624ff35d 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -61,7 +61,6 @@ Requires: photospp Requires: pyquen Requires: pythia6 Requires: pythia8 -Requires: python Requires: python3 Requires: root Requires: sherpa diff --git a/coral-tool-conf.spec b/coral-tool-conf.spec index b3153a25310..1aa024b47a2 100644 --- a/coral-tool-conf.spec +++ b/coral-tool-conf.spec @@ -1,7 +1,7 @@ ### RPM cms coral-tool-conf 10.0 Requires: pcre -Requires: python +Requires: python3 Requires: expat Requires: boost Requires: frontier_client diff --git a/fwlite-tool-conf.spec b/fwlite-tool-conf.spec index a8a04e19377..9e19ea76b90 100644 --- a/fwlite-tool-conf.spec +++ b/fwlite-tool-conf.spec @@ -26,7 +26,6 @@ Requires: libpng Requires: libtiff Requires: libungif Requires: pcre -Requires: python Requires: python3 Requires: root Requires: sigcpp diff --git a/fwlite_python_tools.spec b/fwlite_python_tools.spec index 595cbb6872c..632892abda4 100644 --- a/fwlite_python_tools.spec +++ b/fwlite_python_tools.spec @@ -1,5 +1,4 @@ ### RPM external fwlite_python_tools 1.0 -## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} Source: none diff --git a/pcm_util.spec b/pcm_util.spec index 871920087f7..69574053fda 100644 --- a/pcm_util.spec +++ b/pcm_util.spec @@ -1,7 +1,7 @@ ### RPM external pcm_util 1.0 Source: none -Requires: root clhep tinyxml2 boost fftw3 cuda python hepmc tbb gcc +Requires: root clhep tinyxml2 boost fftw3 cuda python3 hepmc tbb gcc %prep diff --git a/python_tools.spec b/python_tools.spec index 7d308278669..a04aefc3a9f 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -1,11 +1,9 @@ ### RPM external python_tools 3.0 -## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} Source: none -Requires: root curl python python3 xrootd llvm hdf5 mxnet-predict yoda opencv +Requires: root curl python3 xrootd llvm hdf5 mxnet-predict yoda opencv Requires: professor2 rivet frontier_client onnxruntime openldap -Requires: py2-future Requires: py3-anyio Requires: py3-sniffio diff --git a/tensorflow-sources.file b/tensorflow-sources.file index d5b135f39f9..c52fc2605ed 100644 --- a/tensorflow-sources.file +++ b/tensorflow-sources.file @@ -105,16 +105,8 @@ echo '#!/bin/bash' > %{_builddir}/cms-pytool/python3 echo "export PYTHON3PATH=\"${PYTHON3PATH}\"" >> %{_builddir}/cms-pytool/python3 echo "$(which python3) \"\$@\"" >> %{_builddir}/cms-pytool/python3 -echo '#!/bin/bash' > %{_builddir}/cms-pytool/python2 -echo "export PYTHON27PATH=\"${PYTHON27PATH}\"" >> %{_builddir}/cms-pytool/python2 -echo "$(which python2) \"\$@\"" >> %{_builddir}/cms-pytool/python2 - -chmod +x %{_builddir}/cms-pytool/python2 %{_builddir}/cms-pytool/python3 -if [ "%{python_cmd}" = "python3" ] ; then - ln -s python3 %{_builddir}/cms-pytool/python -else - ln -s python2 %{_builddir}/cms-pytool/python -fi +chmod +x %{_builddir}/cms-pytool/python3 +ln -s python3 %{_builddir}/cms-pytool/python export PATH=%{_builddir}/cms-pytool:$PATH # build tensorflow python targets