add pypip pins and move dev status

diff --git a/README.rst b/README.rst
index 1cf175c4c26db560bec1a15d5358fc5e598fad35..1cfa3729b8db9265216105ed39998a6a988e6a91 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -2,28 +2,25 @@
 TimeSide : open web audio processing framework
 ==============================================
 
-TimeSide is a set of python components enabling low and high level audio analysis, imaging, transcoding and streaming. Its high-level API is designed to enable complex processing on large datasets of audio and video assets of any format. Its simple plug-in architecture can be adapted to various use cases.
-
-TimeSide also includes a smart interactive HTML5 player which provides various streaming playback functions, formats selectors, fancy audio visualizations, segmentation and semantic labelling synchronized with audio events. It is embeddable in any web application.
-
-
-Build status
-============
-- Branch **master** : |travis_master| |coveralls_master|
-- Branch **dev** : |travis_dev| |coveralls_dev|
+|version| |downloads| |travis_master| |coveralls_master|
 
 .. |travis_master| image:: https://secure.travis-ci.org/yomguy/TimeSide.png?branch=master
     :target: https://travis-ci.org/yomguy/TimeSide/
 
-.. |travis_dev| image:: https://secure.travis-ci.org/yomguy/TimeSide.png?branch=dev
-    :target: https://travis-ci.org/yomguy/TimeSide/
-
 .. |coveralls_master| image:: https://coveralls.io/repos/yomguy/TimeSide/badge.png?branch=master
   :target: https://coveralls.io/r/yomguy/TimeSide?branch=master
 
-.. |coveralls_dev| image:: https://coveralls.io/repos/yomguy/TimeSide/badge.png?branch=dev
-  :target: https://coveralls.io/r/yomguy/TimeSide?branch=dev
+.. |version| image:: https://pypip.in/version/TimeSide/badge.png
+  :target: https://pypi.python.org/pypi/TimeSide/
+  :alt: Version
 
+.. |downloads| image:: https://pypip.in/download/TimeSide/badge.svg
+    :target: https://pypi.python.org/pypi/TimeSide/
+    :alt: Downloads
+
+TimeSide is a set of python components enabling low and high level audio analysis, imaging, transcoding and streaming. Its high-level API is designed to enable complex processing on large datasets of audio and video assets of any format. Its simple plug-in architecture can be adapted to various use cases.
+
+TimeSide also includes a smart interactive HTML5 player which provides various streaming playback functions, formats selectors, fancy audio visualizations, segmentation and semantic labelling synchronized with audio events. It is embeddable in any web application.
 
 
 Goals
@@ -58,7 +55,6 @@ The streaming architecture of TimeSide relies on 2 main parts: a processing engi
 .. image:: http://vcs.parisson.com/gitweb/?p=timeside.git;a=blob_plain;f=doc/slides/img/timeside_schema.svg;hb=refs/heads/dev
   :width: 800 px
 
-
 Dive in
 ========
 
@@ -337,6 +333,14 @@ At the moment, this server is NOT connected to the player using TimeSide alone.
 Development
 ===========
 
+|travis_dev| |coveralls_dev|
+
+.. |travis_dev| image:: https://secure.travis-ci.org/yomguy/TimeSide.png?branch=dev
+    :target: https://travis-ci.org/yomguy/TimeSide/
+
+.. |coveralls_dev| image:: https://coveralls.io/repos/yomguy/TimeSide/badge.png?branch=dev
+  :target: https://coveralls.io/r/yomguy/TimeSide?branch=dev
+
 First, install TimeSide (see Install).
 
 Then::

diff --git a/doc/source/dev.rst b/doc/source/dev.rst
index db3243c615eacdf570eeeb4f3ac9b925b83ddcb8..846d6dfa9b2085eaa8de5d03f84ee16405b8a55f 100644 (file)
--- a/doc/source/dev.rst
+++ b/doc/source/dev.rst
@@ -1,6 +1,14 @@
 Development
 ===========
 
+|travis_dev| |coveralls_dev|
+
+.. |travis_dev| image:: https://secure.travis-ci.org/yomguy/TimeSide.png?branch=dev
+    :target: https://travis-ci.org/yomguy/TimeSide/
+
+.. |coveralls_dev| image:: https://coveralls.io/repos/yomguy/TimeSide/badge.png?branch=dev
+  :target: https://coveralls.io/r/yomguy/TimeSide?branch=dev
+
 First, install TimeSide (see Install).
 
 Then::

diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index a640ccbaf589ed8264e6495f2ce968ac8f811085..a0d76dc137b3e84a1f392041cd978350102dee57 100644 (file)
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -2,28 +2,25 @@
 TimeSide : open web audio processing framework
 ==============================================
 
-TimeSide is a set of python components enabling low and high level audio analysis, imaging, transcoding and streaming. Its high-level API is designed to enable complex processing on large datasets of audio and video assets of any format. Its simple plug-in architecture can be adapted to various use cases.
-
-TimeSide also includes a smart interactive HTML5 player which provides various streaming playback functions, formats selectors, fancy audio visualizations, segmentation and semantic labelling synchronized with audio events. It is embeddable in any web application.
-
-
-Build status
-============
-- Branch **master** : |travis_master| |coveralls_master|
-- Branch **dev** : |travis_dev| |coveralls_dev|
+|version| |downloads| |travis_master| |coveralls_master|
 
 .. |travis_master| image:: https://secure.travis-ci.org/yomguy/TimeSide.png?branch=master
     :target: https://travis-ci.org/yomguy/TimeSide/
 
-.. |travis_dev| image:: https://secure.travis-ci.org/yomguy/TimeSide.png?branch=dev
-    :target: https://travis-ci.org/yomguy/TimeSide/
-
 .. |coveralls_master| image:: https://coveralls.io/repos/yomguy/TimeSide/badge.png?branch=master
   :target: https://coveralls.io/r/yomguy/TimeSide?branch=master
 
-.. |coveralls_dev| image:: https://coveralls.io/repos/yomguy/TimeSide/badge.png?branch=dev
-  :target: https://coveralls.io/r/yomguy/TimeSide?branch=dev
+.. |version| image:: https://pypip.in/version/TimeSide/badge.png
+  :target: https://pypi.python.org/pypi/TimeSide/
+  :alt: Version
+
+.. |downloads| image:: https://pypip.in/download/TimeSide/badge.svg
+    :target: https://pypi.python.org/pypi/TimeSide/
+    :alt: Downloads
 
+TimeSide is a set of python components enabling low and high level audio analysis, imaging, transcoding and streaming. Its high-level API is designed to enable complex processing on large datasets of audio and video assets of any format. Its simple plug-in architecture can be adapted to various use cases.
+
+TimeSide also includes a smart interactive HTML5 player which provides various streaming playback functions, formats selectors, fancy audio visualizations, segmentation and semantic labelling synchronized with audio events. It is embeddable in any web application.
 
 
 Goals