Skip to content

Commit 5d75049

Browse files
authored
Merge branch 'pytorch:main' into main
2 parents 1f67950 + fa1aa52 commit 5d75049

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.circleci/config.yml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ jobs:
604604
conda env remove -n python${PYTHON_VERSION} || true
605605
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
606606
conda activate python${PYTHON_VERSION}
607-
conda install Pillow>=5.3.0
607+
conda install "Pillow>=5.3.0,!=8.3.*"
608608
conda install -v -y -c pytorch-nightly pytorch
609609
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
610610
- run:

.circleci/smoke_test/docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN conda create -y --name python3.7 python=3.7
3030
RUN conda create -y --name python3.8 python=3.8
3131
SHELL [ "/bin/bash", "-c" ]
3232
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
33-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y Pillow>=5.3.0
34-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y Pillow>=5.3.0
35-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y Pillow>=5.3.0
33+
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y "Pillow>=5.3.0,!=8.3.*"
34+
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y "Pillow>=5.3.0,!=8.3.*"
35+
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y "Pillow>=5.3.0,!=8.3.*"
3636
CMD [ "/bin/bash"]

.circleci/unittest/linux/scripts/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ dependencies:
1111
- ca-certificates
1212
- pip:
1313
- future
14-
- pillow >=5.3.0, !=8.3.0
14+
- pillow >=5.3.0, !=8.3.*
1515
- scipy
1616
- av

.circleci/unittest/linux/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939
if [ $PYTHON_VERSION == "3.6" ]; then
4040
printf "Installing minimal PILLOW version\n"
4141
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
42-
pip install pillow>=5.3.0
42+
pip install "pillow>=5.3.0,!=8.3.*"
4343
fi
4444

4545
printf "* Installing torchvision\n"

.circleci/unittest/windows/scripts/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- ca-certificates
1212
- pip:
1313
- future
14-
- pillow >=5.3.0, !=8.3.0
14+
- pillow >=5.3.0, !=8.3.*
1515
- scipy
1616
- av
1717
- dataclasses

.circleci/unittest/windows/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD
3333
if [ $PYTHON_VERSION == "3.6" ]; then
3434
printf "Installing minimal PILLOW version\n"
3535
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
36-
pip install pillow>=5.3.0
36+
pip install "pillow>=5.3.0,!=8.3.*"
3737
fi
3838

3939
torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")

packaging/build_cmake.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint
2121
setup_conda_cudatoolkit_plain_constraint
2222

2323
if [[ "$OSTYPE" == "msys" ]]; then
24-
conda install -yq conda-build cmake pillow>=5.3.0 future
24+
conda install -yq conda-build cmake "pillow>=5.3.0,!=8.3.*" future
2525
pip install dataclasses
2626
fi
2727

packaging/torchvision/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ requirements:
2727
- libpng
2828
- ffmpeg >=4.2 # [not win]
2929
- jpeg
30-
- pillow >=5.3.0
30+
- pillow >=5.3.0, !=8.3.*
3131
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
3232
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
3333
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}

0 commit comments

Comments
 (0)