Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
d9a3018f
Commit
d9a3018f
authored
Jan 21, 2020
by
Jeremy Reizenstein
Committed by
Francisco Massa
Jan 21, 2020
Browse files
typing only needed for python 3.5 and previous (#1778)
parent
cc404108
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
packaging/conda/build_vision.sh
packaging/conda/build_vision.sh
+6
-0
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+10
-0
packaging/torchvision/meta.yaml
packaging/torchvision/meta.yaml
+1
-1
No files found.
packaging/conda/build_vision.sh
View file @
d9a3018f
...
@@ -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
...
...
packaging/pkg_helpers.bash
View file @
d9a3018f
...
@@ -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
...
...
packaging/torchvision/meta.yaml
View file @
d9a3018f
...
@@ -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 .
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment