Skip to content

Remove python3.5 typing dependency #3288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2021
Merged

Remove python3.5 typing dependency #3288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d39835
Remove python3.5 typing dependency.
datumbox Jan 24, 2021
d50396a
Merge branch 'master' into ci/remove_py3.5
fmassa Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packaging/conda/build_vision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions packaging/pkg_helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion packaging/torchvision/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ test:
- scipy
- av =8.0.1
- ca-certificates
{{ environ.get('CONDA_TYPING_CONSTRAINT') }}


about:
Expand Down