Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
0505fdf0
Commit
0505fdf0
authored
Jan 23, 2020
by
Matthew Brett
Browse files
Deal with raised error in wheel name check code
parent
aed8befe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
tests/test_supported_wheels.sh
tests/test_supported_wheels.sh
+2
-1
No files found.
tests/test_supported_wheels.sh
View file @
0505fdf0
...
@@ -31,7 +31,8 @@ if [ $(uname) == 'Darwin' ]; then
...
@@ -31,7 +31,8 @@ if [ $(uname) == 'Darwin' ]; then
# 2>&1 because Python 2.7 version goes to stderr
# 2>&1 because Python 2.7 version goes to stderr
our_ver
=
$(
$PYTHON_EXE
--version
2>&1 |
awk
'{print $2}'
|
awk
-F
'.'
'{print $1$2}'
)
our_ver
=
$(
$PYTHON_EXE
--version
2>&1 |
awk
'{print $2}'
|
awk
-F
'.'
'{print $1$2}'
)
other_ver
=
$(
[
"
$our_ver
"
==
"37"
]
&&
echo
"36"
||
echo
"37"
)
other_ver
=
$(
[
"
$our_ver
"
==
"37"
]
&&
echo
"36"
||
echo
"37"
)
api_m
=
$(
[
$our_ver
-le
37
]
&&
echo
"m"
)
# Python < 38 needs m for API tag.
api_m
=
$(
[
$our_ver
-le
37
]
&&
echo
"m"
)
||
:
good_whl
=
"tornado-5.1-cp
${
our_ver
}
-cp
${
our_ver
}${
api_m
}
-macosx_10_9_x86_64.whl"
good_whl
=
"tornado-5.1-cp
${
our_ver
}
-cp
${
our_ver
}${
api_m
}
-macosx_10_9_x86_64.whl"
bad_whl
=
"tornado-5.1-cp
${
other_ver
}
-cp
${
other_ver
}
m-macosx_10_9_x86_64.whl"
bad_whl
=
"tornado-5.1-cp
${
other_ver
}
-cp
${
other_ver
}
m-macosx_10_9_x86_64.whl"
if
[
"
$(
$PYTHON_EXE
supported_wheels.py
$bad_whl
)
"
!=
""
]
;
then
if
[
"
$(
$PYTHON_EXE
supported_wheels.py
$bad_whl
)
"
!=
""
]
;
then
...
...
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