"...text-generation-inference.git" did not exist on "211b54ac41cae9a369f3d74bd6cc666ff4a0c526"
Unverified Commit fa1aa52d authored by F-G Fernandez's avatar F-G Fernandez Committed by GitHub
Browse files

chore: Updated all pillow version specifiers (#4946)


Co-authored-by: default avatarPhilip Meier <github.pmeier@posteo.de>
parent 845391cd
......@@ -604,7 +604,7 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda install Pillow>=5.3.0
conda install "Pillow>=5.3.0,!=8.3.*"
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run:
......
......@@ -604,7 +604,7 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda install Pillow>=5.3.0
conda install "Pillow>=5.3.0,!=8.3.*"
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run:
......
......@@ -30,7 +30,7 @@ RUN conda create -y --name python3.7 python=3.7
RUN conda create -y --name python3.8 python=3.8
SHELL [ "/bin/bash", "-c" ]
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y Pillow>=5.3.0
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y Pillow>=5.3.0
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y Pillow>=5.3.0
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y "Pillow>=5.3.0,!=8.3.*"
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y "Pillow>=5.3.0,!=8.3.*"
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y "Pillow>=5.3.0,!=8.3.*"
CMD [ "/bin/bash"]
......@@ -11,6 +11,6 @@ dependencies:
- ca-certificates
- pip:
- future
- pillow >=5.3.0, !=8.3.0
- pillow >=5.3.0, !=8.3.*
- scipy
- av
......@@ -39,7 +39,7 @@ fi
if [ $PYTHON_VERSION == "3.6" ]; then
printf "Installing minimal PILLOW version\n"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip install pillow>=5.3.0
pip install "pillow>=5.3.0,!=8.3.*"
fi
printf "* Installing torchvision\n"
......
......@@ -11,7 +11,7 @@ dependencies:
- ca-certificates
- pip:
- future
- pillow >=5.3.0, !=8.3.0
- pillow >=5.3.0, !=8.3.*
- scipy
- av
- dataclasses
......@@ -33,7 +33,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD
if [ $PYTHON_VERSION == "3.6" ]; then
printf "Installing minimal PILLOW version\n"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip install pillow>=5.3.0
pip install "pillow>=5.3.0,!=8.3.*"
fi
torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")
......
......@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint
setup_conda_cudatoolkit_plain_constraint
if [[ "$OSTYPE" == "msys" ]]; then
conda install -yq conda-build cmake pillow>=5.3.0 future
conda install -yq conda-build cmake "pillow>=5.3.0,!=8.3.*" future
pip install dataclasses
fi
......
......@@ -27,7 +27,7 @@ requirements:
- libpng
- ffmpeg >=4.2 # [not win]
- jpeg
- pillow >=5.3.0
- pillow >=5.3.0, !=8.3.*
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment