diff --git a/.circleci/config.yml b/.circleci/config.yml index b5144dc703e..2be90283d29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1579,7 +1579,7 @@ jobs: $* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*) } - retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes + retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes # sync submodules cd ${PROJ_ROOT} diff --git a/.circleci/docker/common/install_conda.sh b/.circleci/docker/common/install_conda.sh index b7ad26f4483..f7fbcf2a6e6 100755 --- a/.circleci/docker/common/install_conda.sh +++ b/.circleci/docker/common/install_conda.sh @@ -72,14 +72,13 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then # DO NOT install cmake here as it would install a version newer than 3.5, but # we want to pin to version 3.5. if [ "$ANACONDA_PYTHON_VERSION" = "3.8" ]; then - # DO NOT install typing if installing python-3.8, since its part of python-3.8 core packages # Install llvm-8 as it is required to compile llvmlite-0.30.0 from source conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six llvmdev=8.0.0 elif [ "$ANACONDA_PYTHON_VERSION" = "3.7" ]; then # DO NOT install dataclasses if installing python-3.7, since its part of python-3.7 core packages - conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six + conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six else - conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six dataclasses + conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six dataclasses fi if [[ "$CUDA_VERSION" == 9.2* ]]; then conda_install magma-cuda92 -c pytorch diff --git a/.circleci/scripts/binary_ios_build.sh b/.circleci/scripts/binary_ios_build.sh index 1166b3a1bab..4cfe778e513 100644 --- a/.circleci/scripts/binary_ios_build.sh +++ b/.circleci/scripts/binary_ios_build.sh @@ -15,7 +15,7 @@ export PATH="~/anaconda/bin:${PATH}" source ~/anaconda/bin/activate # Install dependencies -conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes +conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes conda install -c conda-forge valgrind --yes export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"} diff --git a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml index aacb45f41a5..d5f07eefb4e 100644 --- a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml +++ b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml @@ -425,7 +425,7 @@ $* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*) } - retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes + retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes # sync submodules cd ${PROJ_ROOT} diff --git a/caffe2/requirements.txt b/caffe2/requirements.txt index 7c0367da1d8..aa8d2be43aa 100644 --- a/caffe2/requirements.txt +++ b/caffe2/requirements.txt @@ -2,4 +2,3 @@ numpy enum34 pyyaml requests -typing diff --git a/setup.py b/setup.py index 1b8998573fe..f49889fc688 100644 --- a/setup.py +++ b/setup.py @@ -308,7 +308,6 @@ def build_deps(): 'benchmark', 'CMakeLists.txt')) check_pydep('yaml', 'pyyaml') - check_pydep('typing', 'typing') build_caffe2(version=version, cmake_python_library=cmake_python_library,