From 05c542547a744199ffc751e9d65a1164c6605f71 Mon Sep 17 00:00:00 2001
From: Vasilis Vryniotis <datumbox@users.noreply.github.com>
Date: Mon, 25 Jan 2021 09:34:56 +0000
Subject: [PATCH] Remove python3.5 typing dependency. (#3288)

Co-authored-by: Francisco Massa <fvsmassa@gmail.com>
---
 packaging/conda/build_vision.sh | 6 ------
 packaging/pkg_helpers.bash      | 9 ---------
 packaging/torchvision/meta.yaml | 1 -
 3 files changed, 16 deletions(-)

diff --git a/packaging/conda/build_vision.sh b/packaging/conda/build_vision.sh
index b326012cf22..167d05159cc 100755
--- a/packaging/conda/build_vision.sh
+++ b/packaging/conda/build_vision.sh
@@ -163,12 +163,6 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
     rm -rf "$output_folder"
     mkdir "$output_folder"
 
-    if [[ "$py_ver" == 3.5 ]]; then
-      export CONDA_TYPING_CONSTRAINT="- typing"
-    else
-      export CONDA_TYPING_CONSTRAINT=""
-    fi
-
     export VSTOOLCHAIN_PACKAGE=vs2017
 
     # We need to build the compiler activation scripts first on Windows
diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash
index 5d967cb18df..e0f0f6dbc37 100644
--- a/packaging/pkg_helpers.bash
+++ b/packaging/pkg_helpers.bash
@@ -143,14 +143,6 @@ setup_macos() {
   fi
 }
 
-# set variable to determine whether the typing library needs to be built in
-setup_typing() {
-  if [[ "$PYTHON_VERSION" == 3.5 ]]; then
-    export CONDA_TYPING_CONSTRAINT="- typing"
-  else
-    export CONDA_TYPING_CONSTRAINT=""
-  fi
-}
 
 # Top-level entry point for things every package will need to do
 #
@@ -159,7 +151,6 @@ setup_env() {
   setup_cuda
   setup_build_version "$1"
   setup_macos
-  setup_typing
 }
 
 # Function to retry functions that sometimes timeout or have flaky failures
diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml
index fadd9b47f72..5802bf264c1 100644
--- a/packaging/torchvision/meta.yaml
+++ b/packaging/torchvision/meta.yaml
@@ -52,7 +52,6 @@ test:
     - scipy
     - av =8.0.1
     - ca-certificates
-    {{ environ.get('CONDA_TYPING_CONSTRAINT') }}
 
 
 about: