From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 29 Apr 2014 08:27:09 +0000 (+0200)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~38
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b96ccc9f22d24624e3d445586f8723bee770431d;p=timeside.git

Merge branch 'dev' into server
---

b96ccc9f22d24624e3d445586f8723bee770431d
diff --cc setup.py
index 760a8ae,11140d6..9699e9d
--- a/setup.py
+++ b/setup.py
@@@ -1,7 -1,23 +1,24 @@@
  #!/usr/bin/env python
  # -*- coding: utf-8 -*-
 +
  from setuptools import setup, find_packages
+ import sys
+ from setuptools.command.test import test as TestCommand
+ 
+ # Pytest
+ class PyTest(TestCommand):
+     def finalize_options(self):
+         TestCommand.finalize_options(self)
+         self.test_args = ['tests', '--ignore', 'tests/sandbox']
+         self.test_suite = True
+ 
+     def run_tests(self):
+         #import here, cause outside the eggs aren't loaded
+         import pytest
+         errno = pytest.main(self.test_args)
+         sys.exit(errno)
+ 
+ 
  
  CLASSIFIERS = [
      'Intended Audience :: Science/Research',
diff --cc timeside/__init__.py
index 333a661,ce217f4..57eb89d
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -1,10 -1,12 +1,12 @@@
  # -*- coding: utf-8 -*-
  
 -import api
 -import core
 -import decoder
 -import analyzer
 -import grapher
 -import encoder
 +from . import api
 +from . import core
 +from . import decoder
 +from . import analyzer
 +from . import grapher
 +from . import encoder
  
  __version__ = '0.5.5'
+ 
+ __all__ = ['api', 'core', 'decoder', 'analyzer', 'grapher', 'encoder']