From c534218aebb021b9d3dfc89b7cb3179f9991b87b Mon Sep 17 00:00:00 2001 From: vishal Date: Tue, 1 Dec 2020 17:11:30 -0500 Subject: [PATCH] Force pip version 19 --- images/onnx-predictor-cpu/Dockerfile | 2 +- images/onnx-predictor-gpu/Dockerfile | 2 +- images/python-predictor-cpu/Dockerfile | 2 +- images/python-predictor-gpu/Dockerfile | 2 +- images/python-predictor-inf/Dockerfile | 2 +- images/tensorflow-predictor/Dockerfile | 2 +- pkg/workloads/cortex/client/cortex/client.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/onnx-predictor-cpu/Dockerfile b/images/onnx-predictor-cpu/Dockerfile index bd6b766b8a..53257d3ef1 100644 --- a/images/onnx-predictor-cpu/Dockerfile +++ b/images/onnx-predictor-cpu/Dockerfile @@ -33,7 +33,7 @@ RUN curl "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.s rm -rf ~/.cache ~/miniconda.sh # split the conda installations because the dev boxes have limited memory -RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip && \ +RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=19.* && \ /opt/conda/bin/conda clean -a && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" > ~/.env && \ diff --git a/images/onnx-predictor-gpu/Dockerfile b/images/onnx-predictor-gpu/Dockerfile index cccc19091d..80ffcd9b49 100644 --- a/images/onnx-predictor-gpu/Dockerfile +++ b/images/onnx-predictor-gpu/Dockerfile @@ -33,7 +33,7 @@ RUN curl "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.s rm -rf ~/.cache ~/miniconda.sh # split the conda installations because the dev boxes have limited memory -RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip && \ +RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=19.* && \ /opt/conda/bin/conda clean -a && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" > ~/.env && \ diff --git a/images/python-predictor-cpu/Dockerfile b/images/python-predictor-cpu/Dockerfile index 6b4df7f741..212da4406a 100644 --- a/images/python-predictor-cpu/Dockerfile +++ b/images/python-predictor-cpu/Dockerfile @@ -33,7 +33,7 @@ RUN curl "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.s rm -rf ~/.cache ~/miniconda.sh # split the conda installations because the dev boxes have limited memory -RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip && \ +RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=19.* && \ /opt/conda/bin/conda clean -a && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" > ~/.env && \ diff --git a/images/python-predictor-gpu/Dockerfile b/images/python-predictor-gpu/Dockerfile index de8fcc1671..736f6824dd 100644 --- a/images/python-predictor-gpu/Dockerfile +++ b/images/python-predictor-gpu/Dockerfile @@ -35,7 +35,7 @@ RUN curl "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.s rm -rf ~/.cache ~/miniconda.sh # split the conda installations because the dev boxes have limited memory -RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip && \ +RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=19.* && \ /opt/conda/bin/conda clean -a && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" > ~/.env && \ diff --git a/images/python-predictor-inf/Dockerfile b/images/python-predictor-inf/Dockerfile index 9e9b0adc5f..ced18ced42 100644 --- a/images/python-predictor-inf/Dockerfile +++ b/images/python-predictor-inf/Dockerfile @@ -43,7 +43,7 @@ RUN curl "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.s rm -rf ~/.cache ~/miniconda.sh # split the conda installations because the dev boxes have limited memory -RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip && \ +RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=19.* && \ /opt/conda/bin/conda clean -a && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" > ~/.env && \ diff --git a/images/tensorflow-predictor/Dockerfile b/images/tensorflow-predictor/Dockerfile index 85f34d6749..d4c577d710 100644 --- a/images/tensorflow-predictor/Dockerfile +++ b/images/tensorflow-predictor/Dockerfile @@ -33,7 +33,7 @@ RUN curl "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.s rm -rf ~/.cache ~/miniconda.sh # split the conda installations because the dev boxes have limited memory -RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip && \ +RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=19.* && \ /opt/conda/bin/conda clean -a && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" > ~/.env && \ diff --git a/pkg/workloads/cortex/client/cortex/client.py b/pkg/workloads/cortex/client/cortex/client.py index ac7013c85a..31ee55e3ec 100644 --- a/pkg/workloads/cortex/client/cortex/client.py +++ b/pkg/workloads/cortex/client/cortex/client.py @@ -116,7 +116,7 @@ def deploy( ) if not is_python_set: - conda_packages = [f"python={actual_version}"] + conda_packages + conda_packages = [f"python={actual_version}", "pip=19.*"] + conda_packages if len(requirements) > 0: with open(project_dir / "requirements.txt", "w") as requirements_file: