diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c7bf22dc67..6a5a06f10ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 78b0793bcb0..d0cbba9e255 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -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: diff --git a/.circleci/smoke_test/docker/Dockerfile b/.circleci/smoke_test/docker/Dockerfile index e2227cf5e8b..27b8ecf7a7f 100644 --- a/.circleci/smoke_test/docker/Dockerfile +++ b/.circleci/smoke_test/docker/Dockerfile @@ -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"] diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index ce3fe3be6e6..df65f034076 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -11,6 +11,6 @@ dependencies: - ca-certificates - pip: - future - - pillow >=5.3.0, !=8.3.0 + - pillow >=5.3.0, !=8.3.* - scipy - av diff --git a/.circleci/unittest/linux/scripts/install.sh b/.circleci/unittest/linux/scripts/install.sh index 5493176f902..689ee29331c 100755 --- a/.circleci/unittest/linux/scripts/install.sh +++ b/.circleci/unittest/linux/scripts/install.sh @@ -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" diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index 5b0d3f5462d..43a33588995 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -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 diff --git a/.circleci/unittest/windows/scripts/install.sh b/.circleci/unittest/windows/scripts/install.sh index 88f716ba599..af2f04772b3 100644 --- a/.circleci/unittest/windows/scripts/install.sh +++ b/.circleci/unittest/windows/scripts/install.sh @@ -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())") diff --git a/packaging/build_cmake.sh b/packaging/build_cmake.sh index eb9e3608063..ebcee13d18d 100755 --- a/packaging/build_cmake.sh +++ b/packaging/build_cmake.sh @@ -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 diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 620d95ed516..168fad6e396 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -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', '') }}