From 4958b12725e3c376126b89bd38f29aa0592de51b Mon Sep 17 00:00:00 2001
From: "root@fubarite.fubar.si" <unknown>
Date: Fri, 5 Feb 2010 03:42:27 +0100
Subject: [PATCH] updating MANIFEST.in, fixing virtualenv tests usage, 2 failed
 tests

---
 MANIFEST.in                        | 6 ++++--
 test/fixture/shell.py              | 5 ++++-
 test/versioning/test_schemadiff.py | 9 +++++----
 test/versioning/test_shell.py      | 4 ++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index d3d266f..b502509 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,5 @@
 include CHANGELOG
-include docs/*.rst
-include docs/conf.py
+include README
+recursive-include docs *
+recursive-include migrate *
+global-exclude *pyc
diff --git a/test/fixture/shell.py b/test/fixture/shell.py
index ad8262b..97bb4ab 100644
--- a/test/fixture/shell.py
+++ b/test/fixture/shell.py
@@ -16,7 +16,10 @@ class Shell(Pathed):
 
     def setUp(self):
         super(Shell, self).setUp()
-        self.env = TestFileEnvironment(os.path.join(self.temp_usable_dir, 'env'))
+        self.env = TestFileEnvironment(
+            base_path=os.path.join(self.temp_usable_dir, 'env'),
+            script_path=[os.path.dirname(sys.executable)],
+        )
 
     def run_version(self, repos_path):
         result = self.env.run('migrate version %s' % repos_path)
diff --git a/test/versioning/test_schemadiff.py b/test/versioning/test_schemadiff.py
index 5ee463a..52d1607 100644
--- a/test/versioning/test_schemadiff.py
+++ b/test/versioning/test_schemadiff.py
@@ -55,11 +55,12 @@ class TestSchemaDiff(fixture.DB):
         diff = schemadiff.getDiffOfModelAgainstDatabase(self.meta, self.engine, excludeTables=['migrate_version'])
         decls, upgradeCommands, downgradeCommands = genmodel.ModelGenerator(diff).toUpgradeDowngradePython()
         self.assertEqualsIgnoreWhitespace(decls, '''
+        from migrate.changeset import schema
         meta = MetaData()
-        tmp_schemadiff = Table('tmp_schemadiff',meta,
-            Column('id',Integer(),primary_key=True,nullable=False),
-            Column('name',UnicodeText(length=None)),
-            Column('data',UnicodeText(length=None)),
+        tmp_schemadiff = Table('tmp_schemadiff', meta,
+            Column('id', Integer(), primary_key=True, nullable=False),
+            Column('name', UnicodeText(length=None)),
+            Column('data', UnicodeText(length=None)),
         )
         ''')
         self.assertEqualsIgnoreWhitespace(upgradeCommands,
diff --git a/test/versioning/test_shell.py b/test/versioning/test_shell.py
index 52e6ce0..0e2a819 100644
--- a/test/versioning/test_shell.py
+++ b/test/versioning/test_shell.py
@@ -408,6 +408,8 @@ class TestShellDatabase(Shell, DB):
         script_text = '''
         from sqlalchemy import *
         from migrate import *
+
+        from migrate.changeset import schema
         
         meta = MetaData(migrate_engine)
         account = Table('account', meta,
@@ -496,6 +498,8 @@ class TestShellDatabase(Shell, DB):
         '''from sqlalchemy import *
         from migrate import *
 
+        from migrate.changeset import schema
+
         meta = MetaData()
         tmp_account_rundiffs = Table('tmp_account_rundiffs', meta,
           Column('id', Integer(),  primary_key=True, nullable=False),