Merge pull request #5245 from cms-sw/smuzaffar-patch-2

[DEVEL] use no-cache-dir for all pip install
cms-sw · Sep 24, 2019 · 18b868b · 18b868b
2 parents 87c3109 + 2c276af
commit 18b868b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build-with-pip.file b/build-with-pip.file
@@ -111,7 +111,7 @@ if [ $(cat files.list | wc -l) -eq 1 ] ; then
    %if "%{doPython3}" == "yes"
       pip3 list --disable-pip-version-check
       %{?PipPreBuildPy3:%PipPreBuildPy3}
-      pip3 install --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} %{?PipBuildOptionsPy3:%PipBuildOptionsPy3} $PIPFILE
+      pip3 install  --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} %{?PipBuildOptionsPy3:%PipBuildOptionsPy3} $PIPFILE
       PKG_NAME=$(pip3 show %{pip_name} --disable-pip-version-check | grep '^Name:' | sed 's|^Name: *||;s| ||g')
       DEPS=$(pip3 check --disable-pip-version-check | grep "^${PKG_NAME}  *%{realversion}  *requires " | sed 's|,.*||;s|.* |py2-|' | tr '\n' ' ')
       if [ "$DEPS" != "" ] ; then
@@ -124,7 +124,7 @@ if [ $(cat files.list | wc -l) -eq 1 ] ; then
    %if "%{doPython2}" == "yes"
       pip2 list  --disable-pip-version-check
       %{?PipPreBuildPy2:%PipPreBuildPy2}
-      pip2 install --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} %{?PipBuildOptionsPy2:%PipBuildOptionsPy2}  $PIPFILE
+      pip2 install  --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} %{?PipBuildOptionsPy2:%PipBuildOptionsPy2}  $PIPFILE
       PKG_NAME=$(pip2 show %{pip_name} --disable-pip-version-check | grep '^Name:' | sed 's|^Name: *||;s| ||g')
       DEPS=$(pip2 check --disable-pip-version-check | grep "^${PKG_NAME}  *%{realversion}  *requires " | sed 's|,.*||;s|.* |py2-|' | tr '\n' ' ')
       if [ "$DEPS" != "" ] ; then

diff --git a/py2-matplotlib.spec b/py2-matplotlib.spec
@@ -33,8 +33,8 @@ export MPLCONFIGDIR=$PWD/no-pkg-config
 PATH=$PWD/no-pkg-config:$PATH \
 export CPLUS_INCLUDE_PATH=${FREETYPE_ROOT}/include/freetype2:${LIBPNG_ROOT}/include/libpng16
 export PYTHONUSERBASE=%i
-pip install . --user
-pip3 install . --user
+pip  install   --no-cache-dir --disable-pip-version-check --no-deps --no-clean -v . --user
+pip3 install   --no-cache-dir --disable-pip-version-check --no-deps --no-clean -v . --user
 
 #python setup.py install --prefix=%i  --single-version-externally-managed --record=/dev/null
 

diff --git a/py2-numpy.spec b/py2-numpy.spec
@@ -45,8 +45,8 @@ EOF
 mkdir -p %i/${PYTHON_LIB_SITE_PACKAGES}
 
 export PYTHONUSERBASE=%i
-pip2 install . --user 
-pip3 install . --user
+pip2 install   --no-cache-dir --disable-pip-version-check --no-deps --no-clean -v . --user
+pip3 install   --no-cache-dir --disable-pip-version-check --no-deps --no-clean -v . --user
 %{relocatePy3SitePackages}
 %{relocatePy2SitePackages}
 perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/*

diff --git a/py2-tensorflow.spec b/py2-tensorflow.spec
@@ -20,9 +20,9 @@ Requires: py2-funcsigs py2-protobuf py2-pbr py2-six py2-packaging py2-appdirs py
 mkdir -p %{i}
 export PYTHONUSERBASE=%i
 pip list
-pip install --user -v ${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-%{tensor_build}.whl
+pip install   --no-cache-dir --disable-pip-version-check --no-deps --no-clean --user -v ${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-%{tensor_build}.whl
 pip3 list
-pip3 install --user -v ${TENSORFLOW_PYTHON3_SOURCES_ROOT}/tensorflow-%{realversion}-%{tensor_python3_build}.whl
+pip3 install   --no-cache-dir --disable-pip-version-check --no-deps --no-clean --user -v ${TENSORFLOW_PYTHON3_SOURCES_ROOT}/tensorflow-%{realversion}-%{tensor_python3_build}.whl
 %{relocatePy3SitePackages}
 %{relocatePy2SitePackages}