diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b5597abe01..b0e4d0e7f9a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -691,7 +691,6 @@ 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,!=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 cfb431d7557..514f1c563aa 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -691,7 +691,6 @@ 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,!=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 ef46e129061..34bdcda1053 100644 --- a/.circleci/smoke_test/docker/Dockerfile +++ b/.circleci/smoke_test/docker/Dockerfile @@ -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.8 python=3.8 RUN conda create -y --name python3.9 python=3.9 +RUN conda create -y --name python3.10 python=3.10 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.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"] diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index 3c8fd4d966c..77ee9929519 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -12,6 +12,5 @@ dependencies: - h5py - pip: - future - - pillow >=5.3.0, !=8.3.* - scipy - av diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index b1377a67812..0e07ae80d0d 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -10,10 +10,9 @@ dependencies: - jpeg - ca-certificates - hdf5 - - setuptools == 58.0.4 + - setuptools - pip: - future - - pillow >=5.3.0, !=8.3.* - scipy - av != 9.1.1 - dataclasses diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index b0b70631112..5eeb2e17b48 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -37,3 +37,9 @@ conda activate "${env_dir}" # 3. Install Conda dependencies printf "* Installing dependencies (except PyTorch)\n" 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 diff --git a/packaging/build_cmake.sh b/packaging/build_cmake.sh index 17b62c55d82..0a4e4e948eb 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,!=8.3.*" future + conda install -yq conda-build cmake future pip install dataclasses fi