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
13a01725
Unverified
Commit
13a01725
authored
Aug 15, 2021
by
Matthew Brett
Committed by
GitHub
Aug 15, 2021
Browse files
Merge pull request #422 from radarhere/python310
MRG: Added Python 3.10 Adds Python 3.10 for #421
parents
863e233d
0bee3028
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
osx_utils.sh
osx_utils.sh
+6
-3
tests/test_fill_pyver.sh
tests/test_fill_pyver.sh
+3
-1
No files found.
osx_utils.sh
View file @
13a01725
...
@@ -19,6 +19,7 @@ LATEST_3p6=3.6.8
...
@@ -19,6 +19,7 @@ LATEST_3p6=3.6.8
LATEST_3p7
=
3.7.9
LATEST_3p7
=
3.7.9
LATEST_3p8
=
3.8.10
LATEST_3p8
=
3.8.10
LATEST_3p9
=
3.9.6
LATEST_3p9
=
3.9.6
LATEST_3p10
=
3.10.0rc1
function
check_python
{
function
check_python
{
...
@@ -75,7 +76,9 @@ function fill_pyver {
...
@@ -75,7 +76,9 @@ function fill_pyver {
echo
$ver
echo
$ver
elif
[
$ver
==
2
]
||
[
$ver
==
"2.7"
]
;
then
elif
[
$ver
==
2
]
||
[
$ver
==
"2.7"
]
;
then
echo
$LATEST_2p7
echo
$LATEST_2p7
elif
[
$ver
==
3
]
||
[
$ver
==
"3.9"
]
;
then
elif
[
$ver
==
3
]
||
[
$ver
==
"3.10"
]
;
then
echo
$LATEST_3p10
elif
[
$ver
==
"3.9"
]
;
then
echo
$LATEST_3p9
echo
$LATEST_3p9
elif
[
$ver
==
"3.8"
]
;
then
elif
[
$ver
==
"3.8"
]
;
then
echo
$LATEST_3p8
echo
$LATEST_3p8
...
@@ -162,7 +165,7 @@ function pyinst_fname_for_version {
...
@@ -162,7 +165,7 @@ function pyinst_fname_for_version {
# creates intel only wheels by default. When PLAT=universal2
# creates intel only wheels by default. When PLAT=universal2
# we set the env variable _PYTHON_HOST_PLATFORM to change this
# we set the env variable _PYTHON_HOST_PLATFORM to change this
# default.
# default.
if
[
"
$(
uname
-m
)
"
==
"arm64"
]
;
then
if
[
"
$(
uname
-m
)
"
==
"arm64"
]
||
[
$(
lex_ver
$py_version
)
-ge
$(
lex_ver 3.10.0
)
]
;
then
if
[
"
$py_version
"
==
"3.9.1"
]
;
then
if
[
"
$py_version
"
==
"3.9.1"
]
;
then
echo
"python-
${
py_version
}
-macos11.0.
${
inst_ext
}
"
echo
"python-
${
py_version
}
-macos11.0.
${
inst_ext
}
"
else
else
...
@@ -320,7 +323,7 @@ function install_mac_cpython {
...
@@ -320,7 +323,7 @@ function install_mac_cpython {
inst_path
=
/Volumes/Python/Python.mpkg
inst_path
=
/Volumes/Python/Python.mpkg
fi
fi
sudo
installer
-pkg
$inst_path
-target
/
sudo
installer
-pkg
$inst_path
-target
/
local
py_mm
=
${
py_version
:0:3
}
local
py_mm
=
${
py_version
%.*
}
PYTHON_EXE
=
$MACPYTHON_PY_PREFIX
/
$py_mm
/bin/python
$py_mm
PYTHON_EXE
=
$MACPYTHON_PY_PREFIX
/
$py_mm
/bin/python
$py_mm
# Install certificates for Python 3.6
# Install certificates for Python 3.6
local
inst_cmd
=
"/Applications/Python
${
py_mm
}
/Install Certificates.command"
local
inst_cmd
=
"/Applications/Python
${
py_mm
}
/Install Certificates.command"
...
...
tests/test_fill_pyver.sh
View file @
13a01725
...
@@ -2,7 +2,9 @@
...
@@ -2,7 +2,9 @@
[
"
$(
fill_pyver 2
)
"
==
$LATEST_2p7
]
||
ingest
[
"
$(
fill_pyver 2
)
"
==
$LATEST_2p7
]
||
ingest
[
"
$(
fill_pyver 2.7
)
"
==
$LATEST_2p7
]
||
ingest
[
"
$(
fill_pyver 2.7
)
"
==
$LATEST_2p7
]
||
ingest
[
"
$(
fill_pyver 2.7.8
)
"
==
"2.7.8"
]
||
ingest
[
"
$(
fill_pyver 2.7.8
)
"
==
"2.7.8"
]
||
ingest
[
"
$(
fill_pyver 3
)
"
==
$LATEST_3p9
]
||
ingest
[
"
$(
fill_pyver 3
)
"
==
$LATEST_3p10
]
||
ingest
[
"
$(
fill_pyver 3.10
)
"
==
$LATEST_3p10
]
||
ingest
[
"
$(
fill_pyver 3.10.0
)
"
==
"3.10.0rc1"
]
||
ingest
[
"
$(
fill_pyver 3.9
)
"
==
$LATEST_3p9
]
||
ingest
[
"
$(
fill_pyver 3.9
)
"
==
$LATEST_3p9
]
||
ingest
[
"
$(
fill_pyver 3.9.0
)
"
==
"3.9.0"
]
||
ingest
[
"
$(
fill_pyver 3.9.0
)
"
==
"3.9.0"
]
||
ingest
[
"
$(
fill_pyver 3.8
)
"
==
$LATEST_3p8
]
||
ingest
[
"
$(
fill_pyver 3.8
)
"
==
$LATEST_3p8
]
||
ingest
...
...
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