Unverified Commit fd935fe9 authored by Philip Meier's avatar Philip Meier Committed by GitHub
Browse files

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: default avatarVasilis Vryniotis <datumbox@users.noreply.github.com>
parent a6336f7a
...@@ -691,7 +691,6 @@ jobs: ...@@ -691,7 +691,6 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION} conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION} conda activate python${PYTHON_VERSION}
conda install "Pillow>=5.3.0,!=8.3.*"
conda install -v -y -c pytorch-nightly pytorch conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2) conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run: - run:
......
...@@ -691,7 +691,6 @@ jobs: ...@@ -691,7 +691,6 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION} conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION} conda activate python${PYTHON_VERSION}
conda install "Pillow>=5.3.0,!=8.3.*"
conda install -v -y -c pytorch-nightly pytorch conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2) conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run: - run:
......
...@@ -28,9 +28,7 @@ ENV PATH /opt/conda/bin:$PATH ...@@ -28,9 +28,7 @@ ENV PATH /opt/conda/bin:$PATH
RUN conda create -y --name python3.7 python=3.7 RUN conda create -y --name python3.7 python=3.7
RUN conda create -y --name python3.8 python=3.8 RUN conda create -y --name python3.8 python=3.8
RUN conda create -y --name python3.9 python=3.9 RUN conda create -y --name python3.9 python=3.9
RUN conda create -y --name python3.10 python=3.10
SHELL [ "/bin/bash", "-c" ] SHELL [ "/bin/bash", "-c" ]
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
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.*"
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.9 && conda install -y "Pillow>=5.3.0,!=8.3.*"
CMD [ "/bin/bash"] CMD [ "/bin/bash"]
...@@ -12,6 +12,5 @@ dependencies: ...@@ -12,6 +12,5 @@ dependencies:
- h5py - h5py
- pip: - pip:
- future - future
- pillow >=5.3.0, !=8.3.*
- scipy - scipy
- av - av
...@@ -10,10 +10,9 @@ dependencies: ...@@ -10,10 +10,9 @@ dependencies:
- jpeg - jpeg
- ca-certificates - ca-certificates
- hdf5 - hdf5
- setuptools == 58.0.4 - setuptools
- pip: - pip:
- future - future
- pillow >=5.3.0, !=8.3.*
- scipy - scipy
- av != 9.1.1 - av != 9.1.1
- dataclasses - dataclasses
......
...@@ -37,3 +37,9 @@ conda activate "${env_dir}" ...@@ -37,3 +37,9 @@ conda activate "${env_dir}"
# 3. Install Conda dependencies # 3. Install Conda dependencies
printf "* Installing dependencies (except PyTorch)\n" printf "* Installing dependencies (except PyTorch)\n"
conda env update --file "${this_dir}/environment.yml" --prune conda env update --file "${this_dir}/environment.yml" --prune
# 4. Downgrade setuptools on Python 3.7.
# See https://github.com/pytorch/vision/pull/5868
if [[ "${PYTHON_VERSION}" == '3.7' ]]; then
pip install --upgrade setuptools==58.0.4
fi
...@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint ...@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint
setup_conda_cudatoolkit_plain_constraint setup_conda_cudatoolkit_plain_constraint
if [[ "$OSTYPE" == "msys" ]]; then if [[ "$OSTYPE" == "msys" ]]; then
conda install -yq conda-build cmake "pillow>=5.3.0,!=8.3.*" future conda install -yq conda-build cmake future
pip install dataclasses pip install dataclasses
fi fi
......
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