rename test package to tests (problems with pytest dist)

setup.py

@@ -21,7 +21,7 @@ readme_file = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'REA
 setup(
     name = "sqlalchemy-migrate",
     version = "0.5.5",
-    packages = find_packages(exclude=['test*']),
+    packages = find_packages(exclude=['tests*']),
     include_package_data = True,
     description = "Database schema migration for SQLAlchemy",
     long_description = readme_file.read(),

tests/changeset/test_changeset.py

@@ -6,7 +6,7 @@ from sqlalchemy import *
 from migrate import changeset
 from migrate.changeset import *
 from migrate.changeset.schema import ColumnDelta
-from test import fixture
+from tests import fixture
 
 
 class TestAddDropColumn(fixture.DB):

tests/changeset/test_constraint.py

@@ -8,7 +8,7 @@ from sqlalchemy.exc import *
 from migrate.changeset import *
 from migrate.changeset.exceptions import *
 
-from test import fixture
+from tests import fixture
 
 
 class CommonTestConstraint(fixture.DB):

tests/fixture/database.py

@@ -9,8 +9,8 @@ from sqlalchemy.orm import create_session
 from sqlalchemy.pool import StaticPool
 
 from migrate.versioning.util import Memoize
-from test.fixture.base import Base
+from tests.fixture.base import Base
-from test.fixture.pathed import Pathed
+from tests.fixture.pathed import Pathed
 
 
 @Memoize

tests/fixture/pathed.py

@@ -6,7 +6,7 @@ import sys
 import shutil
 import tempfile
 
-from test.fixture import base
+from tests.fixture import base
 
 
 class Pathed(base.Base):

tests/fixture/shell.py

@@ -8,7 +8,7 @@ import types
 
 from scripttest import TestFileEnvironment
 
-from test.fixture.pathed import *
+from tests.fixture.pathed import *
 
 
 class Shell(Pathed):

tests/integrated/test_docs.py

@@ -1,7 +1,9 @@
-from test import fixture
 import doctest
 import os
 
+
+from tests import fixture
+
 # Collect tests for all handwritten docs: doc/*.rst
 
 dir = ('..','..','docs')

tests/versioning/test_api.py

@@ -4,9 +4,9 @@
 from migrate.versioning import api
 from migrate.versioning.exceptions import *
 
-from test.fixture.pathed import *
+from tests.fixture.pathed import *
-from test.fixture import models
+from tests.fixture import models
-from test import fixture
+from tests import fixture
 
 
 class TestAPI(Pathed):

tests/versioning/test_cfgparse.py

@@ -4,7 +4,7 @@
 from migrate.versioning import cfgparse
 from migrate.versioning.repository import *
 from migrate.versioning.template import Template
-from test import fixture
+from tests import fixture
 
 
 class TestConfigParser(fixture.Base):

tests/versioning/test_database.py

@@ -1,5 +1,5 @@
 from sqlalchemy import select
-from test import fixture
+from tests import fixture
 
 class TestConnect(fixture.DB):
     level=fixture.DB.TXN

tests/versioning/test_genmodel.py

@@ -6,7 +6,7 @@ import os
 from migrate.versioning.genmodel import *
 from migrate.versioning.exceptions import *
 
-from test import fixture
+from tests import fixture
 
 
 class TestModelGenerator(fixture.Pathed, fixture.DB):

tests/versioning/test_keyedinstance.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-from test import fixture
+from tests import fixture
 from migrate.versioning.util.keyedinstance import *
 
 class TestKeydInstance(fixture.Base):

tests/versioning/test_pathed.py

@@ -1,4 +1,4 @@
-from test import fixture
+from tests import fixture
 from migrate.versioning.pathed import *
 
 class TestPathed(fixture.Base):

tests/versioning/test_repository.py

@@ -9,7 +9,7 @@ from migrate.versioning.repository import *
 from migrate.versioning.script import *
 from nose.tools import raises
 
-from test import fixture
+from tests import fixture
 
 
 class TestRepository(fixture.Pathed):

tests/versioning/test_runchangeset.py

@@ -1,7 +1,12 @@
-from test import fixture
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os,shutil
+
+from tests import fixture
 from migrate.versioning.schema import *
 from migrate.versioning import script
-import os,shutil
+
 
 class TestRunChangeset(fixture.Pathed,fixture.DB):
     level=fixture.DB.CONNECT

tests/versioning/test_schema.py

@@ -9,7 +9,7 @@ from migrate.versioning import script, exceptions, schemadiff
 
 from sqlalchemy import *
 
-from test import fixture
+from tests import fixture
 
 
 class TestControlledSchema(fixture.Pathed, fixture.DB):

tests/versioning/test_schemadiff.py

@@ -1,9 +1,11 @@
 import os
+
 import sqlalchemy
 from sqlalchemy import *
-from test import fixture
-from migrate.versioning import genmodel, schemadiff
 from nose.tools import eq_
+from migrate.versioning import genmodel, schemadiff
+
+from tests import fixture
 
 
 class TestSchemaDiff(fixture.DB):

tests/versioning/test_shell.py

@@ -10,7 +10,7 @@ from sqlalchemy import MetaData, Table
 from migrate.versioning.repository import Repository
 from migrate.versioning import genmodel, shell, api
 from migrate.versioning.exceptions import *
-from test.fixture import Shell, DB, usedb
+from tests.fixture import Shell, DB, usedb
 
 
 class TestShellCommands(Shell):

tests/versioning/test_template.py

@@ -8,7 +8,7 @@ import migrate.versioning.templates
 from migrate.versioning.template import *
 from migrate.versioning import api
 
-from test import fixture
+from tests import fixture
 
 
 class TestTemplate(fixture.Pathed):

tests/versioning/test_util.py

@@ -5,7 +5,7 @@ import os
 
 from sqlalchemy import *
 
-from test import fixture
+from tests import fixture
 from migrate.versioning.util import *
 
 

tests/versioning/test_version.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from test import fixture
 from migrate.versioning.version import *
 from migrate.versioning.exceptions import *
 
+from tests import fixture
+
 
 class TestVerNum(fixture.Base):
     def test_invalid(self):