Commit d9a3018f authored by Jeremy Reizenstein's avatar Jeremy Reizenstein Committed by Francisco Massa
Browse files

typing only needed for python 3.5 and previous (#1778)

parent cc404108
...@@ -157,6 +157,12 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do ...@@ -157,6 +157,12 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
rm -rf "$output_folder" rm -rf "$output_folder"
mkdir "$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 export VSTOOLCHAIN_PACKAGE=vs2017
# We need to build the compiler activation scripts first on Windows # We need to build the compiler activation scripts first on Windows
......
...@@ -115,6 +115,15 @@ setup_macos() { ...@@ -115,6 +115,15 @@ setup_macos() {
fi 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 # Top-level entry point for things every package will need to do
# #
# Usage: setup_env 0.2.0 # Usage: setup_env 0.2.0
...@@ -122,6 +131,7 @@ setup_env() { ...@@ -122,6 +131,7 @@ setup_env() {
setup_cuda setup_cuda
setup_build_version "$1" setup_build_version "$1"
setup_macos setup_macos
setup_typing
} }
# Function to retry functions that sometimes timeout or have flaky failures # Function to retry functions that sometimes timeout or have flaky failures
......
...@@ -47,7 +47,7 @@ test: ...@@ -47,7 +47,7 @@ test:
- mock - mock
- av - av
- ca-certificates - ca-certificates
- typing {{ environ.get('CONDA_TYPING_CONSTRAINT') }}
commands: commands:
pytest . pytest .
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment