diff --git a/Dockerfile-build b/Dockerfile-build index c14e5557d..98b373739 100644 --- a/Dockerfile-build +++ b/Dockerfile-build @@ -161,7 +161,7 @@ RUN bash -c 'if [ `arch` = "ppc64le" ]; then \ # # Install Python requirements # -RUN pip install -U pip==19.3.1 +RUN pip install -U pip==20.0.2 RUN pip install numpy==1.18.1 scipy==1.3.1 setuptools==45.0.0 diff --git a/Dockerfile-runtime b/Dockerfile-runtime index 86a730089..7bf3aaa1f 100644 --- a/Dockerfile-runtime +++ b/Dockerfile-runtime @@ -47,7 +47,7 @@ RUN if [ "$use_miniconda" = "1" ] ; then wget https://repo.continuum.io/minicond ENV PATH=/opt/h2oai/h2o4gpu/python/bin:$PATH -RUN pip install -U pip==19.3.1 +RUN pip install -U pip==20.0.2 # # PPC64 specific - certain libs/whl don't support PPC64LE diff --git a/Makefile b/Makefile index 2cc392b0e..214cda41b 100644 --- a/Makefile +++ b/Makefile @@ -201,21 +201,21 @@ build_py: update_submodule clean_py py # avoid cpp install_xgboost_prev: @echo "----- pip install xgboost previous version built locally -----" - cd xgboost_prev/python-package/dist && $(PYTHON) -m pip install xgboost-*-py3-none-any.whl --constraint ../../../src/interface_py/requirements_buildonly.txt --target ../ + cd xgboost_prev/python-package/dist && $(PYTHON) -m pip install xgboost-*-py3-none-any.whl --no-deps --target ../ install_xgboost: @echo "----- pip install xgboost built locally -----" - cd xgboost/python-package/dist && $(PYTHON) -m pip install xgboost-*-py3-none-any.whl --constraint ../../../src/interface_py/requirements_buildonly.txt --target ../ + cd xgboost/python-package/dist && $(PYTHON) -m pip install xgboost-*-py3-none-any.whl --no-deps --target ../ install_lightgbm_gpu: @echo "----- pip install lightgbm_gpu built locally -----" bash -c 'if [ `arch` != "ppc64le" ]; then \ - cd LightGBM/python-package/dist_gpu && $(PYTHON) -m pip install lightgbm*-py3-none-any.whl --constraint ../../../src/interface_py/requirements_buildonly.txt --target . ; \ + cd LightGBM/python-package/dist_gpu && $(PYTHON) -m pip install lightgbm*-py3-none-any.whl --no-deps --target . ; \ fi' install_lightgbm_cpu: @echo "----- pip install lightgbm (for CPU) built locally -----" - cd LightGBM/python-package/dist_cpu && $(PYTHON) -m pip install lightgbm*-py3-none-any.whl --constraint ../../../src/interface_py/requirements_buildonly.txt --target . + cd LightGBM/python-package/dist_cpu && $(PYTHON) -m pip install lightgbm*-py3-none-any.whl --no-deps --target . install_py: $(MAKE) -j install -C src/interface_py diff --git a/scripts/apply_sklearn_pipinstall.sh b/scripts/apply_sklearn_pipinstall.sh index 89d268a8b..fa811ecff 100755 --- a/scripts/apply_sklearn_pipinstall.sh +++ b/scripts/apply_sklearn_pipinstall.sh @@ -5,5 +5,5 @@ rm -rf sklearn cd scikit-learn file=`ls dist/h2o4gpu*.whl` -pip install $file --upgrade --constraint ../src/interface_py/requirements_buildonly.txt --target ../sklearn/ +pip install $file --upgrade --constraint ../src/interface_py/requirements_buildonly.txt --target ../sklearn/ --upgrade-strategy only-if-needed cd ../