From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sat, 27 Jul 2013 12:07:55 +0000 (+0200)
Subject: Merge branch 'release/0.4.4' into dev
X-Git-Tag: 0.5.0~87
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a07786c6db09922afe54305845d0c132b2825d4b;p=timeside.git

Merge branch 'release/0.4.4' into dev

Conflicts:
	README.rst
	setup.py
	timeside/__init__.py
---

a07786c6db09922afe54305845d0c132b2825d4b
diff --cc README.rst
index c8dda7e,b51dab2..21a42b5
--- a/README.rst
+++ b/README.rst
@@@ -146,14 -152,13 +152,14 @@@ Instal
  
  TimeSide needs some other python modules to run. The following methods explain how to install all dependencies on a Debian based system like Debian, Ubuntu, etc.. On Fedora and Red-Hat you might replace 'apt-get by 'yum', on Gentoo by 'emerge', or any other package manager you like::
  
-  sudo apt-get update
-  sudo apt-get install python python-pip python-setuptools python-gobject \
+  $ sudo apt-get update
+  $ sudo apt-get install python python-pip python-setuptools python-gobject \
                          python-gst0.10 gstreamer0.10-plugins-base gir1.2-gstreamer-0.10 \
                          gstreamer0.10-plugins-good gstreamer0.10-plugins-bad \
 -                        gobject-introspection
 +                        gstreamer0.10-plugins-ugly gobject-introspection python-mutagen \
 +                        python-scipy python-h5py
  
 - $ sudo pip install timeside
 + sudo pip install timeside
  
  To get non-free (MP3, MP4, AAC, etc) decoding and encoding features, add Debian Multimedia repository and install the modules::
  
diff --cc setup.py
index 90f0cfe,b46ba6f..007ba8a
--- a/setup.py
+++ b/setup.py
@@@ -26,14 -26,12 +26,14 @@@ setup
    long_description = open('README.rst').read(),
    author = "Guillaume Pellerin, Paul Brossier, Riccardo Zaccarelli, Olivier Guilyardi",
    author_email = "yomguy@parisson.com, piem@piem.org, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
-   version = '0.5',
+   version = '0.4.4',
    install_requires = [
          'setuptools',
 -        'numpy',
 +        'numpy>=1.6.2',
          'mutagen',
          'pil',
 +        'scipy',
 +        'hf5py',
          ],
    platforms=['OS Independent'],
    license='Gnu Public License V2',
diff --cc timeside/__init__.py
index f10157d,3978b46..7f4cf2e
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -1,13 -1,15 +1,6 @@@
  # -*- coding: utf-8 -*-
  
 -import timeside.api
 -import timeside.exceptions
 -import timeside.core
 -import timeside.component
 -import timeside.metadata
 -import timeside.decoder
 -import timeside.encoder
 -import timeside.grapher
 -import timeside.analyzer
 -import timeside.tools
 -from timeside.core import *
 +import api
 +import core
  
- def get_processors(proc_type):
-     import timeside.decoder
-     import timeside.encoder
-     import timeside.grapher
-     import timeside.analyzer
-     return core.processors(proc_type)
- 
- __version__ = '0.5'
+ __version__ = '0.4.4'