merge from develop

qiniu · Jul 5, 2013 · 49e9c43 · 49e9c43
2 parents e027dc9 + 4b1d682
commit 49e9c43
Show file tree

Hide file tree

Showing 7 changed files with 815 additions and 417 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,6 @@ before_script:
   - export QINIU_TEST_DOMAIN="pysdk.qiniudn.com"
   - export PYTHONPATH="$PYTHONPATH:."
 script:
-  - nosetests --with-coverage --cover-package=qiniu
-  - python docs/demo.py
+  - python setup.py nosetests
+  - python docs/gist/demo.py
   - python docs/gist/conf.py