Skip to content

Commit d7c8d3c

Browse files
malfetfacebook-github-bot
authored andcommitted
Remove references to typing module from setup.py (pytorch#47677)
Summary: It is part of core Python-3.6.2+ Fixes pytorch#47596 Pull Request resolved: pytorch#47677 Reviewed By: walterddr Differential Revision: D24860188 Pulled By: malfet fbshipit-source-id: ad72b433a4493ebe5caca97c2e8a9d4b3c8172d4
1 parent 809660f commit d7c8d3c

File tree

6 files changed

+5
-8
lines changed

6 files changed

+5
-8
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ jobs:
15791579
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
15801580
}
15811581
1582-
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
1582+
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
15831583
15841584
# sync submodules
15851585
cd ${PROJ_ROOT}

.circleci/docker/common/install_conda.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,13 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
7272
# DO NOT install cmake here as it would install a version newer than 3.5, but
7373
# we want to pin to version 3.5.
7474
if [ "$ANACONDA_PYTHON_VERSION" = "3.8" ]; then
75-
# DO NOT install typing if installing python-3.8, since its part of python-3.8 core packages
7675
# Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
7776
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six llvmdev=8.0.0
7877
elif [ "$ANACONDA_PYTHON_VERSION" = "3.7" ]; then
7978
# DO NOT install dataclasses if installing python-3.7, since its part of python-3.7 core packages
80-
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six
79+
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six
8180
else
82-
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six dataclasses
81+
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six dataclasses
8382
fi
8483
if [[ "$CUDA_VERSION" == 9.2* ]]; then
8584
conda_install magma-cuda92 -c pytorch

.circleci/scripts/binary_ios_build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export PATH="~/anaconda/bin:${PATH}"
1515
source ~/anaconda/bin/activate
1616

1717
# Install dependencies
18-
conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
18+
conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
1919
conda install -c conda-forge valgrind --yes
2020
export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
2121

.circleci/verbatim-sources/job-specs/job-specs-custom.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
426426
}
427427
428-
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
428+
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
429429
430430
# sync submodules
431431
cd ${PROJ_ROOT}

caffe2/requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ numpy
22
enum34
33
pyyaml
44
requests
5-
typing

setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ def check_file(f):
308308
'benchmark', 'CMakeLists.txt'))
309309

310310
check_pydep('yaml', 'pyyaml')
311-
check_pydep('typing', 'typing')
312311

313312
build_caffe2(version=version,
314313
cmake_python_library=cmake_python_library,

0 commit comments

Comments
 (0)