Merge lp:~ricardokirkner/u1-test-utils/flatten-namespace into lp:u1-test-utils

[Ricardo Kirkner]

Renamed canonical.isd-tests to testutils for a more flat namespace

Renamed canonical.isd-tests to testutils for a more flat namespace

[lp:~ricardokirkner/u1-test-utils/flatten-namespace]

17. By Ricardo Kirkner on 2012-10-31

renamed project to u1-test-utils

=== removed directory 'canonical'
=== removed file 'canonical/__init__.py'
--- canonical/__init__.py	2011-02-07 16:48:09 +0000
+++ canonical/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-from pkgutil import extend_path
-
-
-# denote package as namespace package
-__path__ = extend_path(__path__, __name__)

=== removed directory 'canonical/isd'
=== removed file 'canonical/isd/__init__.py'
--- canonical/isd/__init__.py	2011-02-05 18:49:23 +0000
+++ canonical/isd/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-__version__ = '0.1'

=== modified file 'setup.py'
--- setup.py	2011-02-08 20:15:31 +0000
+++ setup.py	2012-10-31 10:37:59 +0000
@@ -1,22 +1,14 @@
-import os
 from setuptools import (
     find_packages,
     setup,
 )
 
-
-def get_version():
-    version = [
-        (line.split('=')[1]).strip().strip('"').strip("'")
-        for line in open(os.path.join('canonical', 'isd', '__init__.py'))
-        if line.startswith( '__version__' )
-    ][0]
-    return version
-
-
-setup(name='canonical-isd',
-      version=get_version(),
-      description="Common tools and helpers used by Canonical's ISD team.",
+from u1testutils import __version__
+
+
+setup(name='u1-test-utils',
+      version=__version__,
+      description="Common testcases and utilities for testing Ubuntu One applications.",
       author='Ricardo Kirkner',
       author_email='[e-mail]',
       packages=find_packages(),

=== renamed directory 'canonical/isd/tests' => 'u1testutils'
=== modified file 'u1testutils/__init__.py'
--- canonical/isd/tests/__init__.py	2011-02-05 18:49:23 +0000
+++ u1testutils/__init__.py	2012-10-31 10:37:59 +0000
@@ -0,0 +1,1 @@
+__version__ = '0.1'