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
416f001a
Commit
416f001a
authored
Aug 20, 2015
by
Dan O'Reilly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use tox in travis build. Tweak tox.ini
Signed-off-by:
Dan O'Reilly
<
oreilldf@gmail.com
>
parent
de22561b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
setup.py
python/setup.py
+1
-0
tox.ini
python/tox.ini
+3
-2
travis.sh
travis.sh
+2
-8
No files found.
python/setup.py
View file @
416f001a
...
...
@@ -132,6 +132,7 @@ if __name__ == '__main__':
ext_module_list
=
[]
cpp_impl
=
'--cpp_implementation'
if
cpp_impl
in
sys
.
argv
:
print
(
"YYYYYYYYYYYYYYYYYYYYYYYY"
)
sys
.
argv
.
remove
(
cpp_impl
)
# C++ implementation extension
ext_module_list
.
append
(
...
...
python/tox.ini
View file @
416f001a
...
...
@@ -10,8 +10,9 @@ usedevelop = true
setenv
=
LD_LIBRARY_PATH
=
{toxinidir}/../src/.libs
commands
=
python
setup.py
-q
--cpp_implementation
develop
python
setup.py
build_py
python
setup.py
-q
build_py
python
setup.py
-q
build
{posargs}
python
setup.py
-q
test
-q
{posargs}
pip
install
--install-option
{posargs:
-q}
.
deps
=
six
travis.sh
View file @
416f001a
...
...
@@ -114,10 +114,7 @@ build_javanano_oracle7() {
build_python
()
{
internal_build_cpp
cd
python
python setup.py build
python setup.py
test
python setup.py sdist
sudo
pip
install
virtualenv
&&
virtualenv /tmp/protoenv
&&
/tmp/protoenv/bin/pip
install
dist/
*
tox
cd
..
}
...
...
@@ -126,10 +123,7 @@ build_python_cpp() {
export
LD_LIBRARY_PATH
=
../src/.libs
# for Linux
export
DYLD_LIBRARY_PATH
=
../src/.libs
# for OS X
cd
python
python setup.py build
--cpp_implementation
python setup.py
test
--cpp_implementation
python setup.py sdist
--cpp_implementation
sudo
pip
install
virtualenv
&&
virtualenv /tmp/protoenv
&&
/tmp/protoenv/bin/pip
install
dist/
*
tox
--
--cpp_implementation
cd
..
}
...
...
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