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

Remove python and py2-future #7492

Merged
merged 3 commits into from
Dec 7, 2021
Merged

Remove python and py2-future #7492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8b8047
remove python and py2-future
smuzaffar Oct 5, 2021
1569ae5
remove PYTHON27PATH usage
smuzaffar Oct 5, 2021
3317585
archive python and py2-future
smuzaffar Oct 5, 2021
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
0 py2-future.spec → archive/py2-future.spec
View file
Open in desktop
File renamed without changes.
0 python.spec → archive/python.spec
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion cmssw-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ Requires: photospp
Requires: pyquen
Requires: pythia6
Requires: pythia8
Requires: python
Requires: python3
Requires: root
Requires: sherpa
Expand Down
2 changes: 1 addition & 1 deletion coral-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### RPM cms coral-tool-conf 10.0

Requires: pcre
Requires: python
Requires: python3
Requires: expat
Requires: boost
Requires: frontier_client
Expand Down
1 change: 0 additions & 1 deletion fwlite-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Requires: libpng
Requires: libtiff
Requires: libungif
Requires: pcre
Requires: python
Requires: python3
Requires: root
Requires: sigcpp
Expand Down
1 change: 0 additions & 1 deletion fwlite_python_tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion pcm_util.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 1 addition & 3 deletions python_tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 2 additions & 10 deletions tensorflow-sources.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down