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
efc3d84f
Commit
efc3d84f
authored
Feb 07, 2019
by
Andrew Murray
Browse files
Added pypy 7.0
parent
851e08b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
.travis.yml
.travis.yml
+4
-0
common_utils.sh
common_utils.sh
+7
-2
tests/test_fill_pypy_ver.sh
tests/test_fill_pypy_ver.sh
+2
-0
No files found.
.travis.yml
View file @
efc3d84f
...
@@ -108,6 +108,10 @@ matrix:
...
@@ -108,6 +108,10 @@ matrix:
env
:
env
:
-
PYTHON_VERSION=pypy-6.0
-
PYTHON_VERSION=pypy-6.0
-
VENV=venv
-
VENV=venv
-
os
:
osx
env
:
-
PYTHON_VERSION=pypy-7.0
-
VENV=venv
# Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
# Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
# See: https://docs.travis-ci.com/user/reference/osx/
# See: https://docs.travis-ci.com/user/reference/osx/
-
os
:
osx
-
os
:
osx
...
...
common_utils.sh
View file @
efc3d84f
...
@@ -359,7 +359,7 @@ function fill_submodule {
...
@@ -359,7 +359,7 @@ function fill_submodule {
PYPY_URL=https://bitbucket.org/pypy/pypy/downloads
PYPY_URL=https://bitbucket.org/pypy/pypy/downloads
# As of 201
8
-0
4-25
, the latest verions of PyPy.
# As of 201
9
-0
2-07
, the latest verions of PyPy.
LATEST_PP_4p0=4.0.1
LATEST_PP_4p0=4.0.1
LATEST_PP_4=
$LATEST_PP_4p0
LATEST_PP_4=
$LATEST_PP_4p0
...
@@ -377,6 +377,9 @@ LATEST_PP_5=$LATEST_PP_5p10
...
@@ -377,6 +377,9 @@ LATEST_PP_5=$LATEST_PP_5p10
LATEST_PP_6p0=6.0.0
LATEST_PP_6p0=6.0.0
LATEST_PP_6=
$LATEST_PP_6p0
LATEST_PP_6=
$LATEST_PP_6p0
LATEST_PP_7p0=7.0.0
LATEST_PP_7=
$LATEST_PP_7p0
function unroll_version {
function unroll_version {
# Convert major or major.minor format to major.minor.micro using the above
# Convert major or major.minor format to major.minor.micro using the above
# values recursively
# values recursively
...
@@ -413,7 +416,9 @@ function get_pypy_build_prefix {
...
@@ -413,7 +416,9 @@ function get_pypy_build_prefix {
if [[
$version
=~ ([0-9]+)
\.
([0-9]+) ]]; then
if [[
$version
=~ ([0-9]+)
\.
([0-9]+) ]]; then
local major=
${
BASH_REMATCH
[1]
}
local major=
${
BASH_REMATCH
[1]
}
local minor=
${
BASH_REMATCH
[2]
}
local minor=
${
BASH_REMATCH
[2]
}
if ((
$major
> 5 || (
$major
== 5 &&
$minor
>= 3) )); then
if ((
$major
> 6 )); then
echo "
pypy2.7-v
"
elif ((
$major
> 5 || (
$major
== 5 &&
$minor
>= 3) )); then
echo "
pypy2-v
"
echo "
pypy2-v
"
else
else
echo "
pypy-
"
echo "
pypy-
"
...
...
tests/test_fill_pypy_ver.sh
View file @
efc3d84f
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
[
"
$(
fill_pypy_ver 4
)
"
==
$LATEST_PP_4
]
||
ingest
"lpp4"
[
"
$(
fill_pypy_ver 4
)
"
==
$LATEST_PP_4
]
||
ingest
"lpp4"
[
"
$(
fill_pypy_ver 5
)
"
==
$LATEST_PP_5
]
||
ingest
"lpp5"
[
"
$(
fill_pypy_ver 5
)
"
==
$LATEST_PP_5
]
||
ingest
"lpp5"
[
"
$(
fill_pypy_ver 6
)
"
==
$LATEST_PP_6
]
||
ingest
"lpp6"
[
"
$(
fill_pypy_ver 6
)
"
==
$LATEST_PP_6
]
||
ingest
"lpp6"
[
"
$(
fill_pypy_ver 7
)
"
==
$LATEST_PP_7
]
||
ingest
"lpp7"
[
"
$(
fill_pypy_ver 4.0
)
"
==
$LATEST_PP_4p0
]
||
ingest
[
"
$(
fill_pypy_ver 4.0
)
"
==
$LATEST_PP_4p0
]
||
ingest
[
"
$(
fill_pypy_ver 5.0
)
"
==
$LATEST_PP_5p0
]
||
ingest
[
"
$(
fill_pypy_ver 5.0
)
"
==
$LATEST_PP_5p0
]
||
ingest
[
"
$(
fill_pypy_ver 5.1
)
"
==
$LATEST_PP_5p1
]
||
ingest
[
"
$(
fill_pypy_ver 5.1
)
"
==
$LATEST_PP_5p1
]
||
ingest
...
@@ -13,5 +14,6 @@
...
@@ -13,5 +14,6 @@
[
"
$(
fill_pypy_ver 5.9
)
"
==
$LATEST_PP_5p9
]
||
ingest
[
"
$(
fill_pypy_ver 5.9
)
"
==
$LATEST_PP_5p9
]
||
ingest
[
"
$(
fill_pypy_ver 5.10
)
"
==
$LATEST_PP_5p10
]
||
ingest
[
"
$(
fill_pypy_ver 5.10
)
"
==
$LATEST_PP_5p10
]
||
ingest
[
"
$(
fill_pypy_ver 6.0
)
"
==
$LATEST_PP_6p0
]
||
ingest
[
"
$(
fill_pypy_ver 6.0
)
"
==
$LATEST_PP_6p0
]
||
ingest
[
"
$(
fill_pypy_ver 7.0
)
"
==
$LATEST_PP_7p0
]
||
ingest
[
"
$(
fill_pypy_ver 4.0.1
)
"
==
"4.0.1"
]
||
ingest
[
"
$(
fill_pypy_ver 4.0.1
)
"
==
"4.0.1"
]
||
ingest
[
"
$(
fill_pypy_ver 5.0.1
)
"
==
"5.0.1"
]
||
ingest
[
"
$(
fill_pypy_ver 5.0.1
)
"
==
"5.0.1"
]
||
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