瀏覽代碼

Use tox in travis build. Tweak tox.ini

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Dan O'Reilly 10 年之前
父節點
當前提交
416f001adc
共有 3 個文件被更改,包括 6 次插入10 次删除
  1. 1 0
      python/setup.py
  2. 3 2
      python/tox.ini
  3. 2 8
      travis.sh

+ 1 - 0
python/setup.py

@@ -132,6 +132,7 @@ if __name__ == '__main__':
   ext_module_list = []
   ext_module_list = []
   cpp_impl = '--cpp_implementation'
   cpp_impl = '--cpp_implementation'
   if cpp_impl in sys.argv:
   if cpp_impl in sys.argv:
+    print("YYYYYYYYYYYYYYYYYYYYYYYY")
     sys.argv.remove(cpp_impl)
     sys.argv.remove(cpp_impl)
     # C++ implementation extension
     # C++ implementation extension
     ext_module_list.append(
     ext_module_list.append(

+ 3 - 2
python/tox.ini

@@ -10,8 +10,9 @@ usedevelop = true
 setenv =
 setenv =
     LD_LIBRARY_PATH={toxinidir}/../src/.libs
     LD_LIBRARY_PATH={toxinidir}/../src/.libs
 commands =
 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}
     python setup.py -q test -q {posargs}
+    pip install --install-option {posargs: -q} .
 deps =
 deps =
     six
     six

+ 2 - 8
travis.sh

@@ -114,10 +114,7 @@ build_javanano_oracle7() {
 build_python() {
 build_python() {
   internal_build_cpp
   internal_build_cpp
   cd python
   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 ..
   cd ..
 }
 }
 
 
@@ -126,10 +123,7 @@ build_python_cpp() {
   export   LD_LIBRARY_PATH=../src/.libs # for Linux
   export   LD_LIBRARY_PATH=../src/.libs # for Linux
   export DYLD_LIBRARY_PATH=../src/.libs # for OS X
   export DYLD_LIBRARY_PATH=../src/.libs # for OS X
   cd python
   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 ..
   cd ..
 }
 }