From bdf2fb033f054ebddccc3663ffef59f7e8c20899 Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec@redhat.com>
Date: Mar 31 2015 16:31:30 +0000
Subject: latest upstream (0.9.5)


Drop patches for tests which are not running anyway.

---

diff --git a/.gitignore b/.gitignore
index af26946..3529061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ sqlalchemy-migrate-0.6.tar.gz
 /sqlalchemy-migrate-0.9.1.tar.gz
 /sqlalchemy-migrate-0.9.2.tar.gz
 /sqlalchemy-migrate-0.9.4.tar.gz
+/sqlalchemy-migrate-0.9.5.tar.gz
diff --git a/migrate-py27.patch b/migrate-py27.patch
deleted file mode 100644
index 1d003da..0000000
--- a/migrate-py27.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_shell.py
-===================================================================
---- sqlalchemy-migrate-0.7.1.orig/migrate/tests/versioning/test_shell.py
-+++ sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_shell.py
-@@ -482,8 +482,18 @@ class TestShellDatabase(Shell, DB):
-         self.assertTrue("tables missing from database: tmp_account_rundiffs" in result.stdout)
- 
-         # Test Deprecation
-+        if 'PYTHONWARNINGS' in self.env.environ:
-+            warnings = self.env.environ['PYTHONWARNINGS']
-+        else:
-+            warnings = None
-+        self.env.environ['PYTHONWARNINGS'] = 'default'
-         result = self.env.run('migrate compare_model_to_db %s %s --model=%s' \
-             % (self.url, repos_path, model_module.replace(":", ".")), expect_error=True)
-+        if warnings == None:
-+            del(self.env.environ['PYTHONWARNINGS'])
-+        else:
-+            self.env.environ['PYTHONWARNINGS'] = warnings
-+
-         self.assertEqual(result.returncode, 0)
-         self.assertTrue("tables missing from database: tmp_account_rundiffs" in result.stdout)
- 
diff --git a/no-db2-tests.patch b/no-db2-tests.patch
deleted file mode 100644
index 70979bb..0000000
--- a/no-db2-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur sqlalchemy-migrate-0.9.orig/migrate/tests/changeset/databases/test_ibmdb2.py sqlalchemy-migrate-0.9/migrate/tests/changeset/databases/test_ibmdb2.py
---- sqlalchemy-migrate-0.9.orig/migrate/tests/changeset/databases/test_ibmdb2.py	2014-03-07 15:20:07.000000000 +0000
-+++ sqlalchemy-migrate-0.9/migrate/tests/changeset/databases/test_ibmdb2.py	1970-01-01 00:00:00.000000000 +0000
-@@ -1,32 +0,0 @@
--#!/usr/bin/env python
--# -*- coding: utf-8 -*-
--
--import mock
--
--import six
--
--from migrate.changeset.databases import ibmdb2
--from migrate.tests import fixture
--
--
--class TestIBMDBDialect(fixture.Base):
--    """
--    Test class for ibmdb2 dialect unit tests which do not require
--    a live backend database connection.
--    """
--
--    def test_is_unique_constraint_with_null_cols_supported(self):
--        test_values = {
--            '10.1': False,
--            '10.4.99': False,
--            '10.5': True,
--            '10.5.1': True
--        }
--        for version, supported in six.iteritems(test_values):
--            mock_dialect = mock.MagicMock()
--            mock_dialect.dbms_ver = version
--            self.assertEqual(
--                supported,
--                ibmdb2.is_unique_constraint_with_null_columns_supported(
--                    mock_dialect),
--                'Assertion failed on version: %s' % version)
diff --git a/python-migrate-sqlalchemy-migrate.patch b/python-migrate-sqlalchemy-migrate.patch
index c14f667..436ac13 100644
--- a/python-migrate-sqlalchemy-migrate.patch
+++ b/python-migrate-sqlalchemy-migrate.patch
@@ -1,472 +1,3 @@
-diff -Naur sqlalchemy-migrate-0.9.1.orig/migrate/tests/fixture/shell.py sqlalchemy-migrate-0.9.1/migrate/tests/fixture/shell.py
---- sqlalchemy-migrate-0.9.1.orig/migrate/tests/fixture/shell.py	2014-05-06 14:39:34.000000000 +0000
-+++ sqlalchemy-migrate-0.9.1/migrate/tests/fixture/shell.py	2014-06-13 18:09:14.148005049 +0000
-@@ -25,9 +25,9 @@
-         )
- 
-     def run_version(self, repos_path):
--        result = self.env.run('migrate version %s' % repos_path)
-+        result = self.env.run('sqlalchemy-migrate version %s' % repos_path)
-         return int(result.stdout.strip())
- 
-     def run_db_version(self, url, repos_path):
--        result = self.env.run('migrate db_version %s %s' % (url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate db_version %s %s' % (url, repos_path))
-         return int(result.stdout.strip())
-diff -Naur sqlalchemy-migrate-0.9.1.orig/migrate/tests/versioning/test_shell.py sqlalchemy-migrate-0.9.1/migrate/tests/versioning/test_shell.py
---- sqlalchemy-migrate-0.9.1.orig/migrate/tests/versioning/test_shell.py	2014-06-13 11:53:21.259436263 +0000
-+++ sqlalchemy-migrate-0.9.1/migrate/tests/versioning/test_shell.py	2014-06-13 18:14:08.404009872 +0000
-@@ -21,15 +21,15 @@
- 
-     def test_help(self):
-         """Displays default help dialog"""
--        self.assertEqual(self.env.run('migrate -h').returncode, 0)
--        self.assertEqual(self.env.run('migrate --help').returncode, 0)
--        self.assertEqual(self.env.run('migrate help').returncode, 0)
-+        self.assertEqual(self.env.run('sqlalchemy-migrate -h').returncode, 0)
-+        self.assertEqual(self.env.run('sqlalchemy-migrate --help').returncode, 0)
-+        self.assertEqual(self.env.run('sqlalchemy-migrate help').returncode, 0)
- 
-     def test_help_commands(self):
-         """Display help on a specific command"""
-         # we can only test that we get some output
-         for cmd in api.__all__:
--            result = self.env.run('migrate help %s' % cmd)
-+            result = self.env.run('sqlalchemy-migrate help %s' % cmd)
-             self.assertTrue(isinstance(result.stdout, six.string_types))
-             self.assertTrue(result.stdout)
-             self.assertFalse(result.stderr)
-@@ -37,10 +37,10 @@
-     def test_shutdown_logging(self):
-         """Try to shutdown logging output"""
-         repos = self.tmp_repos()
--        result = self.env.run('migrate create %s repository_name' % repos)
--        result = self.env.run('migrate version %s --disable_logging' % repos)
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % repos)
-+        result = self.env.run('sqlalchemy-migrate version %s --disable_logging' % repos)
-         self.assertEqual(result.stdout, '')
--        result = self.env.run('migrate version %s -q' % repos)
-+        result = self.env.run('sqlalchemy-migrate version %s -q' % repos)
-         self.assertEqual(result.stdout, '')
- 
-         # TODO: assert logging messages to 0
-@@ -94,7 +94,7 @@
-         repos = self.tmp_repos()
- 
-         # Creating a file that doesn't exist should succeed
--        result = self.env.run('migrate create %s repository_name' % repos)
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % repos)
- 
-         # Files should actually be created
-         self.assertTrue(os.path.exists(repos))
-@@ -104,35 +104,35 @@
-         self.assertNotEquals(repos_.config.get('db_settings', 'version_table'), 'None')
- 
-         # Can't create it again: it already exists
--        result = self.env.run('migrate create %s repository_name' % repos,
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % repos,
-             expect_error=True)
-         self.assertEqual(result.returncode, 2)
- 
-     def test_script(self):
-         """We can create a migration script via the command line"""
-         repos = self.tmp_repos()
--        result = self.env.run('migrate create %s repository_name' % repos)
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % repos)
- 
--        result = self.env.run('migrate script --repository=%s Desc' % repos)
-+        result = self.env.run('sqlalchemy-migrate script --repository=%s Desc' % repos)
-         self.assertTrue(os.path.exists('%s/versions/001_Desc.py' % repos))
- 
--        result = self.env.run('migrate script More %s' % repos)
-+        result = self.env.run('sqlalchemy-migrate script More %s' % repos)
-         self.assertTrue(os.path.exists('%s/versions/002_More.py' % repos))
- 
--        result = self.env.run('migrate script "Some Random name" %s' % repos)
-+        result = self.env.run('sqlalchemy-migrate script "Some Random name" %s' % repos)
-         self.assertTrue(os.path.exists('%s/versions/003_Some_Random_name.py' % repos))
- 
-     def test_script_sql(self):
-         """We can create a migration sql script via the command line"""
-         repos = self.tmp_repos()
--        result = self.env.run('migrate create %s repository_name' % repos)
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % repos)
- 
--        result = self.env.run('migrate script_sql mydb foo %s' % repos)
-+        result = self.env.run('sqlalchemy-migrate script_sql mydb foo %s' % repos)
-         self.assertTrue(os.path.exists('%s/versions/001_foo_mydb_upgrade.sql' % repos))
-         self.assertTrue(os.path.exists('%s/versions/001_foo_mydb_downgrade.sql' % repos))
- 
-         # Test creating a second
--        result = self.env.run('migrate script_sql postgres foo --repository=%s' % repos)
-+        result = self.env.run('sqlalchemy-migrate script_sql postgres foo --repository=%s' % repos)
-         self.assertTrue(os.path.exists('%s/versions/002_foo_postgres_upgrade.sql' % repos))
-         self.assertTrue(os.path.exists('%s/versions/002_foo_postgres_downgrade.sql' % repos))
- 
-@@ -144,7 +144,7 @@
-         self.assertTrue(not os.path.exists(script))
- 
-         # No attempt is made to verify correctness of the repository path here
--        result = self.env.run('migrate manage %s --repository=/bla/' % script)
-+        result = self.env.run('sqlalchemy-migrate manage %s --repository=/bla/' % script)
-         self.assertTrue(os.path.exists(script))
- 
- 
-@@ -155,41 +155,41 @@
-         """Create repository, python change script"""
-         super(TestShellRepository, self).setUp()
-         self.path_repos = self.tmp_repos()
--        result = self.env.run('migrate create %s repository_name' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % self.path_repos)
- 
-     def test_version(self):
-         """Correctly detect repository version"""
-         # Version: 0 (no scripts yet); successful execution
--        result = self.env.run('migrate version --repository=%s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate version --repository=%s' % self.path_repos)
-         self.assertEqual(result.stdout.strip(), "0")
- 
-         # Also works as a positional param
--        result = self.env.run('migrate version %s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate version %s' % self.path_repos)
-         self.assertEqual(result.stdout.strip(), "0")
- 
-         # Create a script and version should increment
--        result = self.env.run('migrate script Desc %s' % self.path_repos)
--        result = self.env.run('migrate version %s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate script Desc %s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate version %s' % self.path_repos)
-         self.assertEqual(result.stdout.strip(), "1")
- 
-     def test_source(self):
-         """Correctly fetch a script's source"""
--        result = self.env.run('migrate script Desc --repository=%s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate script Desc --repository=%s' % self.path_repos)
- 
-         filename = '%s/versions/001_Desc.py' % self.path_repos
-         source = open(filename).read()
-         self.assertTrue(source.find('def upgrade') >= 0)
- 
-         # Version is now 1
--        result = self.env.run('migrate version %s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate version %s' % self.path_repos)
-         self.assertEqual(result.stdout.strip(), "1")
- 
-         # Output/verify the source of version 1
--        result = self.env.run('migrate source 1 --repository=%s' % self.path_repos)
-+        result = self.env.run('sqlalchemy-migrate source 1 --repository=%s' % self.path_repos)
-         self.assertEqual(result.stdout.strip(), source.strip())
- 
-         # We can also send the source to a file... test that too
--        result = self.env.run('migrate source 1 %s --repository=%s' %
-+        result = self.env.run('sqlalchemy-migrate source 1 %s --repository=%s' %
-             (filename, self.path_repos))
-         self.assertTrue(os.path.exists(filename))
-         fd = open(filename)
-@@ -209,17 +209,17 @@
-         """Ensure we can set version control on a database"""
-         path_repos = repos = self.tmp_repos()
-         url = self.url
--        result = self.env.run('migrate create %s repository_name' % repos)
-+        result = self.env.run('sqlalchemy-migrate create %s repository_name' % repos)
- 
--        result = self.env.run('migrate drop_version_control %(url)s %(repos)s'\
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(repos)s'\
-             % locals(), expect_error=True)
-         self.assertEqual(result.returncode, 1)
--        result = self.env.run('migrate version_control %(url)s %(repos)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate version_control %(url)s %(repos)s' % locals())
- 
-         # Clean up
--        result = self.env.run('migrate drop_version_control %(url)s %(repos)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(repos)s' % locals())
-         # Attempting to drop vc from a database without it should fail
--        result = self.env.run('migrate drop_version_control %(url)s %(repos)s'\
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(repos)s'\
-             % locals(), expect_error=True)
-         self.assertEqual(result.returncode, 1)
- 
-@@ -228,41 +228,41 @@
-         """Commands with default arguments set by manage.py"""
-         path_repos = repos = self.tmp_repos()
-         url = self.url
--        result = self.env.run('migrate create --name=repository_name %s' % repos)
--        result = self.env.run('migrate drop_version_control %(url)s %(repos)s' % locals(), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate create --name=repository_name %s' % repos)
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(repos)s' % locals(), expect_error=True)
-         self.assertEqual(result.returncode, 1)
--        result = self.env.run('migrate version_control %(url)s %(repos)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate version_control %(url)s %(repos)s' % locals())
- 
--        result = self.env.run('migrate drop_version_control %(url)s %(repos)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(repos)s' % locals())
- 
-     @usedb()
-     def test_version_control_specified(self):
-         """Ensure we can set version control to a particular version"""
-         path_repos = self.tmp_repos()
-         url = self.url
--        result = self.env.run('migrate create --name=repository_name %s' % path_repos)
--        result = self.env.run('migrate drop_version_control %(url)s %(path_repos)s' % locals(), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate create --name=repository_name %s' % path_repos)
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(path_repos)s' % locals(), expect_error=True)
-         self.assertEqual(result.returncode, 1)
- 
-         # Fill the repository
-         path_script = self.tmp_py()
-         version = 2
-         for i in range(version):
--            result = self.env.run('migrate script Desc --repository=%s' % path_repos)
-+            result = self.env.run('sqlalchemy-migrate script Desc --repository=%s' % path_repos)
- 
-         # Repository version is correct
--        result = self.env.run('migrate version %s' % path_repos)
-+        result = self.env.run('sqlalchemy-migrate version %s' % path_repos)
-         self.assertEqual(result.stdout.strip(), str(version))
- 
-         # Apply versioning to DB
--        result = self.env.run('migrate version_control %(url)s %(path_repos)s %(version)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate version_control %(url)s %(path_repos)s %(version)s' % locals())
- 
-         # Test db version number (should start at 2)
--        result = self.env.run('migrate db_version %(url)s %(path_repos)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate db_version %(url)s %(path_repos)s' % locals())
-         self.assertEqual(result.stdout.strip(), str(version))
- 
-         # Clean up
--        result = self.env.run('migrate drop_version_control %(url)s %(path_repos)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %(url)s %(path_repos)s' % locals())
- 
-     @usedb()
-     def test_upgrade(self):
-@@ -270,67 +270,67 @@
-         # Create a repository
-         repos_name = 'repos_name'
-         repos_path = self.tmp()
--        result = self.env.run('migrate create %(repos_path)s %(repos_name)s' % locals())
-+        result = self.env.run('sqlalchemy-migrate create %(repos_path)s %(repos_name)s' % locals())
-         self.assertEqual(self.run_version(repos_path), 0)
- 
-         # Version the DB
--        result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
--        result = self.env.run('migrate version_control %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate version_control %s %s' % (self.url, repos_path))
- 
-         # Upgrades with latest version == 0
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
--        result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
--        result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
--        result = self.env.run('migrate upgrade %s %s 1' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s 1' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 1)
--        result = self.env.run('migrate upgrade %s %s -1' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s -1' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 2)
- 
-         # Add a script to the repository; upgrade the db
--        result = self.env.run('migrate script Desc --repository=%s' % (repos_path))
-+        result = self.env.run('sqlalchemy-migrate script Desc --repository=%s' % (repos_path))
-         self.assertEqual(self.run_version(repos_path), 1)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
-         # Test preview
--        result = self.env.run('migrate upgrade %s %s 0 --preview_sql' % (self.url, repos_path))
--        result = self.env.run('migrate upgrade %s %s 0 --preview_py' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s 0 --preview_sql' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s 0 --preview_py' % (self.url, repos_path))
- 
--        result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_db_version(self.url, repos_path), 1)
- 
-         # Downgrade must have a valid version specified
--        result = self.env.run('migrate downgrade %s %s' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate downgrade %s %s' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 2)
--        result = self.env.run('migrate downgrade %s %s -1' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate downgrade %s %s -1' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 2)
--        result = self.env.run('migrate downgrade %s %s 2' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate downgrade %s %s 2' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 2)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 1)
- 
--        result = self.env.run('migrate downgrade %s %s 0' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate downgrade %s %s 0' % (self.url, repos_path))
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
--        result = self.env.run('migrate downgrade %s %s 1' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate downgrade %s %s 1' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 2)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
--        result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %s %s' % (self.url, repos_path))
- 
-     def _run_test_sqlfile(self, upgrade_script, downgrade_script):
-         # TODO: add test script that checks if db really changed
-         repos_path = self.tmp()
-         repos_name = 'repos'
- 
--        result = self.env.run('migrate create %s %s' % (repos_path, repos_name))
--        result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
--        result = self.env.run('migrate version_control %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate create %s %s' % (repos_path, repos_name))
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate version_control %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_version(repos_path), 0)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
-         beforeCount = len(os.listdir(os.path.join(repos_path, 'versions')))  # hmm, this number changes sometimes based on running from svn
--        result = self.env.run('migrate script_sql %s --repository=%s' % ('postgres', repos_path))
-+        result = self.env.run('sqlalchemy-migrate script_sql %s --repository=%s' % ('postgres', repos_path))
-         self.assertEqual(self.run_version(repos_path), 1)
-         self.assertEqual(len(os.listdir(os.path.join(repos_path, 'versions'))), beforeCount + 2)
- 
-@@ -340,11 +340,11 @@
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
-         self.assertRaises(Exception, self.engine.text('select * from t_table').execute)
- 
--        result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate upgrade %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_db_version(self.url, repos_path), 1)
-         self.engine.text('select * from t_table').execute()
- 
--        result = self.env.run('migrate downgrade %s %s 0' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate downgrade %s %s 0' % (self.url, repos_path))
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
-         self.assertRaises(Exception, self.engine.text('select * from t_table').execute)
- 
-@@ -384,15 +384,15 @@
-         repos_name = 'repos_name'
-         repos_path = self.tmp()
- 
--        result = self.env.run('migrate create repository_name --repository=%s' % repos_path)
--        result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
--        result = self.env.run('migrate version_control %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate create repository_name --repository=%s' % repos_path)
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate version_control %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_version(repos_path), 0)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
-         # Empty script should succeed
--        result = self.env.run('migrate script Desc %s' % repos_path)
--        result = self.env.run('migrate test %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate script Desc %s' % repos_path)
-+        result = self.env.run('sqlalchemy-migrate test %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_version(repos_path), 1)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
-@@ -414,7 +414,7 @@
-         file.write(script_text)
-         file.close()
- 
--        result = self.env.run('migrate test %s %s bla' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate test %s %s bla' % (self.url, repos_path), expect_error=True)
-         self.assertEqual(result.returncode, 2)
-         self.assertEqual(self.run_version(repos_path), 1)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
-@@ -445,7 +445,7 @@
-         file = open(script_path, 'w')
-         file.write(script_text)
-         file.close()
--        result = self.env.run('migrate test %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate test %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_version(repos_path), 1)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
-@@ -465,19 +465,19 @@
-         self.meta.reflect()
-         self.meta.drop_all()  # in case junk tables are lying around in the test database
- 
--        result = self.env.run('migrate create %s %s' % (repos_path, repos_name))
--        result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
--        result = self.env.run('migrate version_control %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate create %s %s' % (repos_path, repos_name))
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate version_control %s %s' % (self.url, repos_path))
-         self.assertEqual(self.run_version(repos_path), 0)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)
- 
-         # Setup helper script.
--        result = self.env.run('migrate manage %s --repository=%s --url=%s --model=%s'\
-+        result = self.env.run('sqlalchemy-migrate manage %s --repository=%s --url=%s --model=%s'\
-             % (script_path, repos_path, self.url, model_module))
-         self.assertTrue(os.path.exists(script_path))
- 
-         # Model is defined but database is empty.
--        result = self.env.run('migrate compare_model_to_db %s %s --model=%s' \
-+        result = self.env.run('sqlalchemy-migrate compare_model_to_db %s %s --model=%s' \
-             % (self.url, repos_path, model_module))
-         self.assertTrue("tables missing from database: tmp_account_rundiffs" in result.stdout)
- 
-@@ -487,7 +487,7 @@
-         else:
-             warnings = None
-         self.env.environ['PYTHONWARNINGS'] = 'default'
--        result = self.env.run('migrate compare_model_to_db %s %s --model=%s' \
-+        result = self.env.run('sqlalchemy-migrate compare_model_to_db %s %s --model=%s' \
-             % (self.url, repos_path, model_module.replace(":", ".")), expect_error=True)
-         if warnings == None:
-             del(self.env.environ['PYTHONWARNINGS'])
-@@ -499,19 +499,19 @@
-         self.assertTrue("tables missing from database: tmp_account_rundiffs" in result.stdout)
- 
-         # Update db to latest model.
--        result = self.env.run('migrate update_db_from_model %s %s %s'\
-+        result = self.env.run('sqlalchemy-migrate update_db_from_model %s %s %s'\
-             % (self.url, repos_path, model_module))
-         self.assertEqual(self.run_version(repos_path), 0)
-         self.assertEqual(self.run_db_version(self.url, repos_path), 0)  # version did not get bumped yet because new version not yet created
- 
--        result = self.env.run('migrate compare_model_to_db %s %s %s'\
-+        result = self.env.run('sqlalchemy-migrate compare_model_to_db %s %s %s'\
-             % (self.url, repos_path, model_module))
-         self.assertTrue("No schema diffs" in result.stdout)
- 
--        result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
--        result = self.env.run('migrate version_control %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True)
-+        result = self.env.run('sqlalchemy-migrate version_control %s %s' % (self.url, repos_path))
- 
--        result = self.env.run('migrate create_model %s %s' % (self.url, repos_path))
-+        result = self.env.run('sqlalchemy-migrate create_model %s %s' % (self.url, repos_path))
-         temp_dict = dict()
-         six.exec_(result.stdout, temp_dict)
- 
-@@ -525,10 +525,10 @@
-   ##Column('passwd', String(length=None, convert_unicode=False, assert_unicode=None))""" in result.stdout)
- 
-         ## We're happy with db changes, make first db upgrade script to go from version 0 -> 1.
--        #result = self.env.run('migrate make_update_script_for_model', expect_error=True)
-+        #result = self.env.run('sqlalchemy-migrate make_update_script_for_model', expect_error=True)
-         #self.assertTrue('Not enough arguments' in result.stderr)
- 
--        #result_script = self.env.run('migrate make_update_script_for_model %s %s %s %s'\
-+        #result_script = self.env.run('sqlalchemy-migrate make_update_script_for_model %s %s %s %s'\
-             #% (self.url, repos_path, old_model_module, model_module))
-         #self.assertEqualIgnoreWhitespace(result_script.stdout,
-         #'''from sqlalchemy import *
-@@ -555,11 +555,11 @@
-             #tmp_account_rundiffs.drop()''')
- 
-         ## Save the upgrade script.
--        #result = self.env.run('migrate script Desc %s' % repos_path)
-+        #result = self.env.run('sqlalchemy-migrate script Desc %s' % repos_path)
-         #upgrade_script_path = '%s/versions/001_Desc.py' % repos_path
-         #open(upgrade_script_path, 'w').write(result_script.stdout)
- 
--        #result = self.env.run('migrate compare_model_to_db %s %s %s'\
-+        #result = self.env.run('sqlalchemy-migrate compare_model_to_db %s %s %s'\
-             #% (self.url, repos_path, model_module))
-         #self.assertTrue("No schema diffs" in result.stdout)
- 
 diff -Naur sqlalchemy-migrate-0.9.1.orig/setup.cfg sqlalchemy-migrate-0.9.1/setup.cfg
 --- sqlalchemy-migrate-0.9.1.orig/setup.cfg	2014-05-06 14:40:25.000000000 +0000
 +++ sqlalchemy-migrate-0.9.1/setup.cfg	2014-06-13 18:09:14.150005083 +0000
diff --git a/python-migrate.spec b/python-migrate.spec
index d78f727..acd3999 100644
--- a/python-migrate.spec
+++ b/python-migrate.spec
@@ -5,7 +5,7 @@
 %global srcname sqlalchemy-migrate
 
 Name: python-migrate
-Version: 0.9.4
+Version: 0.9.5
 Release: 1%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
@@ -13,10 +13,6 @@ Group: Development/Languages
 License: MIT
 URL: https://github.com/stackforge/%{srcname}
 Source0: http://pypi.python.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz
-# Patch to avoid DB2 tests until ibm_db_sa python module is available
-Patch0: no-db2-tests.patch
-# Patch to fix a unittest on python-2.7
-Patch1: migrate-py27.patch
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
 Patch100: python-migrate-sqlalchemy-migrate.patch
 
@@ -62,8 +58,6 @@ database change sets and database repository versioning.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .db2
-%patch1 -p1 -b .py27
 %patch100 -p1 -b .rename
 
 # use real unittest in python 2.7 and up
@@ -104,6 +98,9 @@ echo 'sqlite:///__tmp__' > test_db.cfg
 %{python_sitelib}/*
 
 %changelog
+* Tue Mar 31 2015 Pádraig Brady <pbrady@redhat.com> - 0.9.5-1
+- Latest upstream
+
 * Tue Feb 10 2015 Pádraig Brady <pbrady@redhat.com> - 0.9.4-1
 - Latest upstream
 
diff --git a/sources b/sources
index 0154c68..efe4645 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbe292725021cbb700cd99c0f6ab4a63  sqlalchemy-migrate-0.9.4.tar.gz
+0bc7febc649ddf5318d5d6a78a6d7124  sqlalchemy-migrate-0.9.5.tar.gz