Skip to content

Commit fd935fe

Browse files
pmeierdatumbox
andauthored
remove explicit install of Pillow throughout CI (#5950)
* remove explicit install of Pillow throughout CI * explicitly install zlib in windows conda env * check pillow on Windows * move check into conda env * fix * more debug output * more debug * add debug also to linux * retry w/ and w/o packaging third party library * tag debug * more debug * pin setuptools < 61 * install setuptools from pip * cleanup * try remove one more Co-authored-by: Vasilis Vryniotis <[email protected]>
1 parent a6336f7 commit fd935fe

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.circleci/config.yml

Lines changed: 0 additions & 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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,6 @@ jobs:
691691
conda env remove -n python${PYTHON_VERSION} || true
692692
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
693693
conda activate python${PYTHON_VERSION}
694-
conda install "Pillow>=5.3.0,!=8.3.*"
695694
conda install -v -y -c pytorch-nightly pytorch
696695
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
697696
- run:

.circleci/smoke_test/docker/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ ENV PATH /opt/conda/bin:$PATH
2828
RUN conda create -y --name python3.7 python=3.7
2929
RUN conda create -y --name python3.8 python=3.8
3030
RUN conda create -y --name python3.9 python=3.9
31+
RUN conda create -y --name python3.10 python=3.10
3132
SHELL [ "/bin/bash", "-c" ]
3233
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
33-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y "Pillow>=5.3.0,!=8.3.*"
34-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y "Pillow>=5.3.0,!=8.3.*"
35-
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.9 && conda install -y "Pillow>=5.3.0,!=8.3.*"
3634
CMD [ "/bin/bash"]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ dependencies:
1212
- h5py
1313
- pip:
1414
- future
15-
- pillow >=5.3.0, !=8.3.*
1615
- scipy
1716
- av

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ dependencies:
1010
- jpeg
1111
- ca-certificates
1212
- hdf5
13-
- setuptools == 58.0.4
13+
- setuptools
1414
- pip:
1515
- future
16-
- pillow >=5.3.0, !=8.3.*
1716
- scipy
1817
- av != 9.1.1
1918
- dataclasses

.circleci/unittest/windows/scripts/setup_env.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,9 @@ conda activate "${env_dir}"
3737
# 3. Install Conda dependencies
3838
printf "* Installing dependencies (except PyTorch)\n"
3939
conda env update --file "${this_dir}/environment.yml" --prune
40+
41+
# 4. Downgrade setuptools on Python 3.7.
42+
# See https://github.com/pytorch/vision/pull/5868
43+
if [[ "${PYTHON_VERSION}" == '3.7' ]]; then
44+
pip install --upgrade setuptools==58.0.4
45+
fi

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,!=8.3.*" future
24+
conda install -yq conda-build cmake future
2525
pip install dataclasses
2626
fi
2727

0 commit comments

Comments
 (0)