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
05c54254
Unverified
Commit
05c54254
authored
Jan 25, 2021
by
Vasilis Vryniotis
Committed by
GitHub
Jan 25, 2021
Browse files
Remove python3.5 typing dependency. (#3288)
Co-authored-by:
Francisco Massa
<
fvsmassa@gmail.com
>
parent
7dfd8dc8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
16 deletions
+0
-16
packaging/conda/build_vision.sh
packaging/conda/build_vision.sh
+0
-6
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+0
-9
packaging/torchvision/meta.yaml
packaging/torchvision/meta.yaml
+0
-1
No files found.
packaging/conda/build_vision.sh
View file @
05c54254
...
...
@@ -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
...
...
packaging/pkg_helpers.bash
View file @
05c54254
...
...
@@ -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
...
...
packaging/torchvision/meta.yaml
View file @
05c54254
...
...
@@ -52,7 +52,6 @@ test:
-
scipy
-
av =8.0.1
-
ca-certificates
{{
environ.get('CONDA_TYPING_CONSTRAINT')
}}
about
:
...
...
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