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
2a9dd424
Commit
2a9dd424
authored
Jul 17, 2019
by
Matthew Brett
Browse files
Merge branch 'pr/240' into devel
* pr/240: Removed Python 3.4
parents
0e6dbbff
52d30bee
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
42 deletions
+9
-42
.appveyor.yml
.appveyor.yml
+0
-6
.travis.yml
.travis.yml
+0
-7
README.rst
README.rst
+2
-12
osx_utils.sh
osx_utils.sh
+3
-10
tests/test_fill_pyver.sh
tests/test_fill_pyver.sh
+0
-1
tests/test_manylinux_utils.sh
tests/test_manylinux_utils.sh
+3
-3
tests/test_osx_utils.sh
tests/test_osx_utils.sh
+1
-3
No files found.
.appveyor.yml
View file @
2a9dd424
...
...
@@ -13,12 +13,6 @@ environment:
-
PYTHON
:
"
C:
\\
Miniconda-x64"
PYTHON_VERSION
:
"
2.7"
PYTHON_ARCH
:
"
64"
-
PYTHON
:
"
C:
\\
Miniconda34"
PYTHON_VERSION
:
"
3.4"
PYTHON_ARCH
:
"
32"
-
PYTHON
:
"
C:
\\
Miniconda34-x64"
PYTHON_VERSION
:
"
3.4"
PYTHON_ARCH
:
"
64"
-
PYTHON
:
"
C:
\\
Miniconda35"
PYTHON_VERSION
:
"
3.5"
PYTHON_ARCH
:
"
32"
...
...
.travis.yml
View file @
2a9dd424
...
...
@@ -51,13 +51,6 @@ matrix:
env
:
-
PYTHON_VERSION=2.7
-
VENV=venv
-
os
:
osx
env
:
-
PYTHON_VERSION=3.4
-
os
:
osx
env
:
-
PYTHON_VERSION=3.4
-
VENV=venv
-
os
:
osx
env
:
-
PYTHON_VERSION=3.5
...
...
README.rst
View file @
2a9dd424
...
...
@@ -13,7 +13,7 @@ The Travis CI scripts are designed to build *and test*:
* 64-bit ``manylinux1_x86_64`` wheels, both narrow and wide Unicode builds;
* 32-bit ``manylinux1_i686`` wheels, both narrow and wide Unicode builds.
You can currently build and test against Pythons 2.7,
3.4,
3.5, 3.6, 3.7.
You can currently build and test against Pythons 2.7, 3.5, 3.6, 3.7.
The small innovation here is that you can test against 32-bit builds, and both
wide and narrow Unicode Python 2 builds, which was not easy on the default
...
...
@@ -24,7 +24,7 @@ The AppVeyor setup is designed to build *and test*:
* 64-bit Windows ``win_amd64`` wheels;
* 32-bit Windows ``win32`` wheels.
You can currently build and test against Pythons 2.7,
3.4,
3.5, 3.6, 3.7.
You can currently build and test against Pythons 2.7, 3.5, 3.6, 3.7.
*****************
How does it work?
...
...
@@ -219,13 +219,6 @@ To use these scripts
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- UNICODE_WIDTH=16
- os: linux
env:
- MB_PYTHON_VERSION=3.4
- os: linux
env:
- MB_PYTHON_VERSION=3.4
- PLAT=i686
- os: linux
env:
- MB_PYTHON_VERSION=3.5
...
...
@@ -247,9 +240,6 @@ To use these scripts
env:
- MB_PYTHON_VERSION=2.7
- MB_PYTHON_OSX_VER=10.9
- os: osx
env:
- MB_PYTHON_VERSION=3.4
- os: osx
env:
- MB_PYTHON_VERSION=3.5
...
...
osx_utils.sh
View file @
2a9dd424
...
...
@@ -18,7 +18,6 @@ WORKING_SDIR=working
# available.
# See: https://www.python.org/downloads/mac-osx/
LATEST_2p7
=
2.7.16
LATEST_3p4
=
3.4.4
LATEST_3p5
=
3.5.4
LATEST_3p6
=
3.6.8
LATEST_3p7
=
3.7.3
...
...
@@ -84,8 +83,6 @@ function fill_pyver {
echo
$LATEST_3p6
elif
[
$ver
==
"3.5"
]
;
then
echo
$LATEST_3p5
elif
[
$ver
==
"3.4"
]
;
then
echo
$LATEST_3p4
else
echo
"Can't fill version
$ver
"
1>&2
exit
1
...
...
@@ -109,11 +106,7 @@ function pyinst_ext_for_version {
echo
"dmg"
fi
elif
[
$py_0
-ge
3
]
;
then
if
[
"
$(
lex_ver
$py_version
)
"
-ge
"
$(
lex_ver 3.4.2
)
"
]
;
then
echo
"pkg"
else
echo
"dmg"
fi
fi
}
...
...
@@ -255,7 +248,7 @@ function install_mac_cpython {
# Parameters
# $py_version
# Version given in major or major.minor or major.minor.micro e.g
# "3" or "3.
4
" or "3.
4
.1".
# "3" or "3.
7
" or "3.
7
.1".
# $py_osx_ver
# {major.minor | not defined}
# if defined, the macOS version that Python is built for, e.g.
...
...
@@ -286,7 +279,7 @@ function install_mac_pypy {
# Installs pypy.org PyPy
# Parameter $version
# Version given in major or major.minor or major.minor.micro e.g
# "3" or "3.
4
" or "3.
4
.1".
# "3" or "3.
7
" or "3.
7
.1".
# sets $PYTHON_EXE variable to python executable
local
py_version
=
$(
fill_pypy_ver
$1
)
local
py_build
=
$(
get_pypy_build_prefix
$py_version
)
$py_version
-osx64
...
...
tests/test_fill_pyver.sh
View file @
2a9dd424
...
...
@@ -9,4 +9,3 @@
[
"
$(
fill_pyver 3.6.0
)
"
==
"3.6.0"
]
||
ingest
[
"
$(
fill_pyver 3.5
)
"
==
$LATEST_3p5
]
||
ingest
[
"
$(
fill_pyver 3.5.0
)
"
==
"3.5.0"
]
||
ingest
[
"
$(
fill_pyver 3.4
)
"
==
$LATEST_3p4
]
||
ingest
tests/test_manylinux_utils.sh
View file @
2a9dd424
...
...
@@ -4,9 +4,9 @@
[
"
$(
cpython_path 2.7
)
"
==
"/opt/python/cp27-cp27mu"
]
||
ingest
"cp 2.7"
[
"
$(
cpython_path 2.7 32
)
"
==
"/opt/python/cp27-cp27mu"
]
||
ingest
"cp 2.7 32"
[
"
$(
cpython_path 2.7 16
)
"
==
"/opt/python/cp27-cp27m"
]
||
ingest
"cp 2.7 16"
[
"
$(
cpython_path 3.4
)
"
==
"/opt/python/cp34-cp34m"
]
||
ingest
"cp 3.4"
[
"
$(
cpython_path 3.4 32
)
"
==
"/opt/python/cp34-cp34m"
]
||
ingest
"cp 3.4 32"
[
"
$(
cpython_path 3.4 16
)
"
==
"/opt/python/cp34-cp34m"
]
||
ingest
"cp 3.4 16"
[
"
$(
cpython_path 3.5
)
"
==
"/opt/python/cp35-cp35m"
]
||
ingest
"cp 3.5"
[
"
$(
cpython_path 3.5 32
)
"
==
"/opt/python/cp35-cp35m"
]
||
ingest
"cp 3.5 32"
[
"
$(
cpython_path 3.5 16
)
"
==
"/opt/python/cp35-cp35m"
]
||
ingest
"cp 3.5 16"
[
"
$(
cpython_path 3.7
)
"
==
"/opt/python/cp37-cp37m"
]
||
ingest
"cp 3.7"
[
"
$(
cpython_path 3.7 32
)
"
==
"/opt/python/cp37-cp37m"
]
||
ingest
"cp 3.7 32"
[
"
$(
cpython_path 3.7 16
)
"
==
"/opt/python/cp37-cp37m"
]
||
ingest
"cp 3.7 16"
\ No newline at end of file
tests/test_osx_utils.sh
View file @
2a9dd424
...
...
@@ -5,10 +5,8 @@
[
"
$(
pyinst_ext_for_version 2.7.9
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 2.7
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 2
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 3.4.1
)
"
==
dmg
]
||
ingest
[
"
$(
pyinst_ext_for_version 3.4.2
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 3.5.0
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 3.
4
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 3.
5
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_ext_for_version 3
)
"
==
pkg
]
||
ingest
[
"
$(
pyinst_fname_for_version 2.7.14
)
"
==
"python-2.7.14-macosx10.6.pkg"
]
||
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