Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
028d6f13
Commit
028d6f13
authored
Aug 22, 2017
by
Jie Luo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Python 3.5 3.6
parent
0b7e9788
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
Dockerfile
jenkins/docker/Dockerfile
+7
-0
tox.ini
python/tox.ini
+1
-1
tests.sh
tests.sh
+4
-2
No files found.
jenkins/docker/Dockerfile
View file @
028d6f13
...
...
@@ -217,6 +217,13 @@ RUN apt-get install -y \
# -- For javascript --
\
npm
##################
# Python 3.5 3.6 dependencies.
RUN
apt-get clean
&&
apt-get update
&&
apt-get
install
-y
--force-yes
\
python3.5-dev
\
python3.6-dev
\
&&
apt-get clean
# On Debian/Ubuntu, nodejs binary is named 'nodejs' because the name 'node'
# is taken by another legacy binary. We don't have that legacy binary and
# npm expects the binary to be named 'node', so we just create a symbol
...
...
python/tox.ini
View file @
028d6f13
[tox]
envlist
=
py{26,27,33,34}-{cpp,python}
py{26,27,33,34
,35,36
}-{cpp,python}
[testenv]
usedevelop
=
true
...
...
tests.sh
View file @
028d6f13
...
...
@@ -237,6 +237,8 @@ internal_install_python_deps() {
sudo
apt-get
install
-y
python2.6 python2.6-dev
sudo
apt-get
install
-y
python3.3 python3.3-dev
sudo
apt-get
install
-y
python3.4 python3.4-dev
sudo
apt-get
install
-y
python3.5 python3.5-dev
sudo
apt-get
install
-y
python3.6 python3.6-dev
fi
}
...
...
@@ -278,7 +280,7 @@ build_python() {
cd
python
# Only test Python 2.6/3.x on Linux
if
[
$(
uname
-s
)
==
"Linux"
]
;
then
envlist
=
py
\{
26,27,33,34
\}
-python
envlist
=
py
\{
26,27,33,34
,35,36
\}
-python
else
envlist
=
py27-python
fi
...
...
@@ -294,7 +296,7 @@ build_python_cpp() {
cd
python
# Only test Python 2.6/3.x on Linux
if
[
$(
uname
-s
)
==
"Linux"
]
;
then
envlist
=
py
\{
26,27,33,34
\}
-cpp
envlist
=
py
\{
26,27,33,34
,35,36
\}
-cpp
else
envlist
=
py27-cpp
fi
...
...
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