Skip to content

Commit 36347bb

Browse files
NicolasHugfacebook-github-bot
authored andcommitted
[fbsync] Fix inconsistent version pinning across yaml files (#3790)
Summary: * Fix inconsistent version pinning across yaml files. * Pin pillow to >=5.3.0 * Pin pillow>=5.3.0 everywhere Reviewed By: datumbox Differential Revision: D28473332 fbshipit-source-id: 0feb5317c408873cb9da314e973653f74b9941d0
1 parent d363382 commit 36347bb

File tree

10 files changed

+11
-14
lines changed

10 files changed

+11
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ jobs:
580580
fi
581581
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
582582
conda activate python${PYTHON_VERSION}
583-
conda install Pillow
583+
conda install Pillow>=5.3.0
584584
conda install -v -y -c pytorch-nightly pytorch
585585
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
586586
- run:

.circleci/config.yml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ jobs:
580580
fi
581581
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
582582
conda activate python${PYTHON_VERSION}
583-
conda install Pillow
583+
conda install Pillow>=5.3.0
584584
conda install -v -y -c pytorch-nightly pytorch
585585
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
586586
- 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
34-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y Pillow
35-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y Pillow
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
3636
CMD [ "/bin/bash"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ dependencies:
1414
- ca-certificates
1515
- pip:
1616
- future
17-
- pillow>=4.1.1
17+
- pillow >=5.3.0
1818
- scipy
1919
- av

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

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

3535
printf "* Installing torchvision\n"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- ca-certificates
1515
- pip:
1616
- future
17-
- pillow>=4.1.1
17+
- pillow >=5.3.0
1818
- scipy
1919
- av
2020
- dataclasses

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

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

3737
printf "* Installing torchvision\n"

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 future
24+
conda install -yq conda-build cmake pillow>=5.3.0 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
@@ -52,7 +52,7 @@ test:
5252
requires:
5353
- pytest
5454
- scipy
55-
- av >=8.0.1
55+
- av
5656
# NOTE: Pinned to fix issues with size_t on Windows
5757
- jpeg <=9b
5858
- ca-certificates

torchvision/transforms/transforms.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ class RandomPerspective(torch.nn.Module):
704704
For backward compatibility integer values (e.g. ``PIL.Image.NEAREST``) are still acceptable.
705705
fill (sequence or number): Pixel fill value for the area outside the transformed
706706
image. Default is ``0``. If given a number, the value is used for all bands respectively.
707-
If input is PIL Image, the options is only available for ``Pillow>=5.0.0``.
708707
"""
709708

710709
def __init__(self, distortion_scale=0.5, p=0.5, interpolation=InterpolationMode.BILINEAR, fill=0):
@@ -1216,7 +1215,6 @@ class RandomRotation(torch.nn.Module):
12161215
Default is the center of the image.
12171216
fill (sequence or number): Pixel fill value for the area outside the rotated
12181217
image. Default is ``0``. If given a number, the value is used for all bands respectively.
1219-
If input is PIL Image, the options is only available for ``Pillow>=5.2.0``.
12201218
resample (int, optional): deprecated argument and will be removed since v0.10.0.
12211219
Please use the ``interpolation`` parameter instead.
12221220
@@ -1327,7 +1325,6 @@ class RandomAffine(torch.nn.Module):
13271325
For backward compatibility integer values (e.g. ``PIL.Image.NEAREST``) are still acceptable.
13281326
fill (sequence or number): Pixel fill value for the area outside the transformed
13291327
image. Default is ``0``. If given a number, the value is used for all bands respectively.
1330-
If input is PIL Image, the options is only available for ``Pillow>=5.0.0``.
13311328
fillcolor (sequence or number, optional): deprecated argument and will be removed since v0.10.0.
13321329
Please use the ``fill`` parameter instead.
13331330
resample (int, optional): deprecated argument and will be removed since v0.10.0.

0 commit comments

Comments
 (0)