From 1c8022691888a5addf20489655b4ec8508c2df2c Mon Sep 17 00:00:00 2001 From: iElectric Date: Fri, 5 Feb 2010 18:45:17 +0100 Subject: [PATCH] rename test package to tests (problems with pytest dist) --- setup.py | 2 +- {test => tests}/__init__.py | 0 {test => tests}/changeset/__init__.py | 0 {test => tests}/changeset/test_changeset.py | 2 +- {test => tests}/changeset/test_constraint.py | 2 +- {test => tests}/fixture/__init__.py | 0 {test => tests}/fixture/base.py | 0 {test => tests}/fixture/database.py | 4 ++-- {test => tests}/fixture/models.py | 0 {test => tests}/fixture/pathed.py | 2 +- {test => tests}/fixture/shell.py | 2 +- {test => tests}/integrated/__init__.py | 0 {test => tests}/integrated/test_docs.py | 4 +++- {test => tests}/versioning/__init__.py | 0 {test => tests}/versioning/test_api.py | 6 +++--- {test => tests}/versioning/test_cfgparse.py | 2 +- {test => tests}/versioning/test_database.py | 2 +- {test => tests}/versioning/test_genmodel.py | 2 +- {test => tests}/versioning/test_keyedinstance.py | 2 +- {test => tests}/versioning/test_pathed.py | 2 +- {test => tests}/versioning/test_repository.py | 2 +- {test => tests}/versioning/test_runchangeset.py | 9 +++++++-- {test => tests}/versioning/test_schema.py | 2 +- {test => tests}/versioning/test_schemadiff.py | 6 ++++-- {test => tests}/versioning/test_script.py | 0 {test => tests}/versioning/test_shell.py | 2 +- {test => tests}/versioning/test_template.py | 2 +- {test => tests}/versioning/test_util.py | 2 +- {test => tests}/versioning/test_version.py | 3 ++- 29 files changed, 36 insertions(+), 26 deletions(-) rename {test => tests}/__init__.py (100%) rename {test => tests}/changeset/__init__.py (100%) rename {test => tests}/changeset/test_changeset.py (99%) rename {test => tests}/changeset/test_constraint.py (99%) rename {test => tests}/fixture/__init__.py (100%) rename {test => tests}/fixture/base.py (100%) rename {test => tests}/fixture/database.py (98%) rename {test => tests}/fixture/models.py (100%) rename {test => tests}/fixture/pathed.py (98%) rename {test => tests}/fixture/shell.py (95%) rename {test => tests}/integrated/__init__.py (100%) rename {test => tests}/integrated/test_docs.py (93%) rename {test => tests}/versioning/__init__.py (100%) rename {test => tests}/versioning/test_api.py (97%) rename {test => tests}/versioning/test_cfgparse.py (97%) rename {test => tests}/versioning/test_database.py (92%) rename {test => tests}/versioning/test_genmodel.py (89%) rename {test => tests}/versioning/test_keyedinstance.py (97%) rename {test => tests}/versioning/test_pathed.py (98%) rename {test => tests}/versioning/test_repository.py (99%) rename {test => tests}/versioning/test_runchangeset.py (95%) rename {test => tests}/versioning/test_schema.py (99%) rename {test => tests}/versioning/test_schemadiff.py (99%) rename {test => tests}/versioning/test_script.py (100%) rename {test => tests}/versioning/test_shell.py (99%) rename {test => tests}/versioning/test_template.py (99%) rename {test => tests}/versioning/test_util.py (99%) rename {test => tests}/versioning/test_version.py (99%) diff --git a/setup.py b/setup.py index 03be971..dd9ddc0 100644 --- a/setup.py +++ b/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(), diff --git a/test/__init__.py b/tests/__init__.py similarity index 100% rename from test/__init__.py rename to tests/__init__.py diff --git a/test/changeset/__init__.py b/tests/changeset/__init__.py similarity index 100% rename from test/changeset/__init__.py rename to tests/changeset/__init__.py diff --git a/test/changeset/test_changeset.py b/tests/changeset/test_changeset.py similarity index 99% rename from test/changeset/test_changeset.py rename to tests/changeset/test_changeset.py index 76553c7..8e9dcc2 100644 --- a/test/changeset/test_changeset.py +++ b/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): diff --git a/test/changeset/test_constraint.py b/tests/changeset/test_constraint.py similarity index 99% rename from test/changeset/test_constraint.py rename to tests/changeset/test_constraint.py index 82b796b..193bdff 100644 --- a/test/changeset/test_constraint.py +++ b/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): diff --git a/test/fixture/__init__.py b/tests/fixture/__init__.py similarity index 100% rename from test/fixture/__init__.py rename to tests/fixture/__init__.py diff --git a/test/fixture/base.py b/tests/fixture/base.py similarity index 100% rename from test/fixture/base.py rename to tests/fixture/base.py diff --git a/test/fixture/database.py b/tests/fixture/database.py similarity index 98% rename from test/fixture/database.py rename to tests/fixture/database.py index 6529ca5..f9a4980 100644 --- a/test/fixture/database.py +++ b/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 test.fixture.pathed import Pathed +from tests.fixture.base import Base +from tests.fixture.pathed import Pathed @Memoize diff --git a/test/fixture/models.py b/tests/fixture/models.py similarity index 100% rename from test/fixture/models.py rename to tests/fixture/models.py diff --git a/test/fixture/pathed.py b/tests/fixture/pathed.py similarity index 98% rename from test/fixture/pathed.py rename to tests/fixture/pathed.py index a5c81ec..3f670de 100644 --- a/test/fixture/pathed.py +++ b/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): diff --git a/test/fixture/shell.py b/tests/fixture/shell.py similarity index 95% rename from test/fixture/shell.py rename to tests/fixture/shell.py index 97bb4ab..c3ea86f 100644 --- a/test/fixture/shell.py +++ b/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): diff --git a/test/integrated/__init__.py b/tests/integrated/__init__.py similarity index 100% rename from test/integrated/__init__.py rename to tests/integrated/__init__.py diff --git a/test/integrated/test_docs.py b/tests/integrated/test_docs.py similarity index 93% rename from test/integrated/test_docs.py rename to tests/integrated/test_docs.py index d85857f..71c97a7 100644 --- a/test/integrated/test_docs.py +++ b/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') diff --git a/test/versioning/__init__.py b/tests/versioning/__init__.py similarity index 100% rename from test/versioning/__init__.py rename to tests/versioning/__init__.py diff --git a/test/versioning/test_api.py b/tests/versioning/test_api.py similarity index 97% rename from test/versioning/test_api.py rename to tests/versioning/test_api.py index 0356a85..f4ea73c 100644 --- a/test/versioning/test_api.py +++ b/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 test.fixture import models -from test import fixture +from tests.fixture.pathed import * +from tests.fixture import models +from tests import fixture class TestAPI(Pathed): diff --git a/test/versioning/test_cfgparse.py b/tests/versioning/test_cfgparse.py similarity index 97% rename from test/versioning/test_cfgparse.py rename to tests/versioning/test_cfgparse.py index e9ded6a..f424162 100644 --- a/test/versioning/test_cfgparse.py +++ b/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): diff --git a/test/versioning/test_database.py b/tests/versioning/test_database.py similarity index 92% rename from test/versioning/test_database.py rename to tests/versioning/test_database.py index 9b1b35f..090c086 100644 --- a/test/versioning/test_database.py +++ b/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 diff --git a/test/versioning/test_genmodel.py b/tests/versioning/test_genmodel.py similarity index 89% rename from test/versioning/test_genmodel.py rename to tests/versioning/test_genmodel.py index 8d6a6ee..0fb7aed 100644 --- a/test/versioning/test_genmodel.py +++ b/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): diff --git a/test/versioning/test_keyedinstance.py b/tests/versioning/test_keyedinstance.py similarity index 97% rename from test/versioning/test_keyedinstance.py rename to tests/versioning/test_keyedinstance.py index 9bc9202..6e4f5dc 100644 --- a/test/versioning/test_keyedinstance.py +++ b/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): diff --git a/test/versioning/test_pathed.py b/tests/versioning/test_pathed.py similarity index 98% rename from test/versioning/test_pathed.py rename to tests/versioning/test_pathed.py index 7980da0..a2dfc24 100644 --- a/test/versioning/test_pathed.py +++ b/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): diff --git a/test/versioning/test_repository.py b/tests/versioning/test_repository.py similarity index 99% rename from test/versioning/test_repository.py rename to tests/versioning/test_repository.py index 6258abc..a650d91 100644 --- a/test/versioning/test_repository.py +++ b/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): diff --git a/test/versioning/test_runchangeset.py b/tests/versioning/test_runchangeset.py similarity index 95% rename from test/versioning/test_runchangeset.py rename to tests/versioning/test_runchangeset.py index fe5a58e..1b79b15 100644 --- a/test/versioning/test_runchangeset.py +++ b/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 diff --git a/test/versioning/test_schema.py b/tests/versioning/test_schema.py similarity index 99% rename from test/versioning/test_schema.py rename to tests/versioning/test_schema.py index 4d103a8..3d14809 100644 --- a/test/versioning/test_schema.py +++ b/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): diff --git a/test/versioning/test_schemadiff.py b/tests/versioning/test_schemadiff.py similarity index 99% rename from test/versioning/test_schemadiff.py rename to tests/versioning/test_schemadiff.py index 52d1607..c35a9b5 100644 --- a/test/versioning/test_schemadiff.py +++ b/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): diff --git a/test/versioning/test_script.py b/tests/versioning/test_script.py similarity index 100% rename from test/versioning/test_script.py rename to tests/versioning/test_script.py diff --git a/test/versioning/test_shell.py b/tests/versioning/test_shell.py similarity index 99% rename from test/versioning/test_shell.py rename to tests/versioning/test_shell.py index 0e2a819..4c54076 100644 --- a/test/versioning/test_shell.py +++ b/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): diff --git a/test/versioning/test_template.py b/tests/versioning/test_template.py similarity index 99% rename from test/versioning/test_template.py rename to tests/versioning/test_template.py index f813dea..18303ab 100644 --- a/test/versioning/test_template.py +++ b/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): diff --git a/test/versioning/test_util.py b/tests/versioning/test_util.py similarity index 99% rename from test/versioning/test_util.py rename to tests/versioning/test_util.py index 7471651..f913285 100644 --- a/test/versioning/test_util.py +++ b/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 * diff --git a/test/versioning/test_version.py b/tests/versioning/test_version.py similarity index 99% rename from test/versioning/test_version.py rename to tests/versioning/test_version.py index 82e8133..5840612 100644 --- a/test/versioning/test_version.py +++ b/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):