[python-migrate/el6] update to version 0.7.1
Pádraig Brady
pbrady at fedoraproject.org
Tue Jan 22 17:41:27 UTC 2013
commit 8dea6fc88a57c2455ab4724201c7beb9e2c07ec2
Author: Pádraig Brady <P at draigBrady.com>
Date: Tue Jan 22 16:44:24 2013 +0000
update to version 0.7.1
.gitignore | 1 +
migrate-0.7-compat.patch | 78 ----------------------------
migrate-fix-deprecation-warning.patch | 35 -------------
migrate-py27.patch | 21 ++------
migrate-test-whitespace.patch | 34 ++++++++++++
python-migrate-sqlalchemy-migrate.patch | 85 +++++++++++++++----------------
python-migrate.spec | 20 ++++----
sources | 2 +-
8 files changed, 93 insertions(+), 183 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bf2496..6981667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sqlalchemy-migrate-0.6.tar.gz
+/sqlalchemy-migrate-0.7.1.tar.gz
diff --git a/migrate-py27.patch b/migrate-py27.patch
index 2d74db8..1a0b757 100644
--- a/migrate-py27.patch
+++ b/migrate-py27.patch
@@ -1,17 +1,8 @@
-Index: sqlalchemy-migrate-0.6/migrate/tests/versioning/test_shell.py
-===================================================================
---- sqlalchemy-migrate-0.6.orig/migrate/tests/versioning/test_shell.py
-+++ sqlalchemy-migrate-0.6/migrate/tests/versioning/test_shell.py
-@@ -4,6 +4,7 @@
- import os
- import sys
- import tempfile
-+
- try:
- from runpy import run_module
- except ImportError:
-@@ -476,8 +477,18 @@ class TestShellDatabase(Shell, DB):
- self.assert_("tables missing in database: tmp_account_rundiffs" in result.stdout)
+diff -Naur sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_shell.py sqlalchemy-migrate-0.7.1-a/migrate/tests/versioning/test_shell.py
+--- sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_shell.py 2010-10-31 12:19:56.000000000 +0000
++++ sqlalchemy-migrate-0.7.1-a/migrate/tests/versioning/test_shell.py 2013-01-22 16:30:39.606918270 +0000
+@@ -482,8 +482,18 @@
+ self.assert_("tables missing from database: tmp_account_rundiffs" in result.stdout)
# Test Deprecation
+ if 'PYTHONWARNINGS' in self.env.environ:
@@ -28,4 +19,4 @@ Index: sqlalchemy-migrate-0.6/migrate/tests/versioning/test_shell.py
+
self.assertEqual(result.returncode, 0)
self.assertTrue("DeprecationWarning" in result.stderr)
- self.assert_("tables missing in database: tmp_account_rundiffs" in result.stdout)
+ self.assert_("tables missing from database: tmp_account_rundiffs" in result.stdout)
diff --git a/migrate-test-whitespace.patch b/migrate-test-whitespace.patch
new file mode 100644
index 0000000..d204b49
--- /dev/null
+++ b/migrate-test-whitespace.patch
@@ -0,0 +1,34 @@
+diff -Naur sqlalchemy-migrate-0.7.1.orig/migrate/tests/versioning/test_genmodel.py sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_genmodel.py
+--- sqlalchemy-migrate-0.7.1.orig/migrate/tests/versioning/test_genmodel.py 2010-10-31 12:19:56.000000000 +0000
++++ sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_genmodel.py 2013-01-22 17:23:12.163526446 +0000
+@@ -58,7 +58,19 @@
+ # Check Python upgrade and downgrade of database from updated model.
+ diff = schemadiff.getDiffOfModelAgainstDatabase(self.meta, self.engine, excludeTables=['migrate_version'])
+ decls, upgradeCommands, downgradeCommands = genmodel.ModelGenerator(diff,self.engine).toUpgradeDowngradePython()
+- self.assertEqualsIgnoreWhitespace(decls, '''
++
++ if repr(String()) == 'String()':
++ good_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()),
++ Column('data', UnicodeText()),
++ )
++ '''
++ else:
++ good_decls='''
+ from migrate.changeset import schema
+ meta = MetaData()
+ tmp_schemadiff = Table('tmp_schemadiff', meta,
+@@ -66,7 +78,8 @@
+ Column('name', UnicodeText(length=None)),
+ Column('data', UnicodeText(length=None)),
+ )
+- ''')
++ '''
++ self.assertEqualsIgnoreWhitespace(decls, good_decls)
+ self.assertEqualsIgnoreWhitespace(upgradeCommands,
+ '''meta.bind = migrate_engine
+ tmp_schemadiff.create()''')
diff --git a/python-migrate-sqlalchemy-migrate.patch b/python-migrate-sqlalchemy-migrate.patch
index 8696358..993484a 100644
--- a/python-migrate-sqlalchemy-migrate.patch
+++ b/python-migrate-sqlalchemy-migrate.patch
@@ -1,23 +1,7 @@
-Index: setup.py
-===================================================================
---- setup.py.orig
-+++ setup.py
-@@ -32,8 +32,8 @@ setup(
- license = "MIT",
- entry_points = """
- [console_scripts]
-- migrate = migrate.versioning.shell:main
-- migrate-repository = migrate.versioning.migrate_repository:main
-+ sqlalchemy-migrate = migrate.versioning.shell:main
-+ sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
- """,
- test_suite = "nose.collector",
- )
-Index: migrate/tests/fixture/shell.py
-===================================================================
---- migrate/tests/fixture/shell.py.orig
-+++ migrate/tests/fixture/shell.py
-@@ -25,9 +25,9 @@ class Shell(Pathed):
+diff -Naur sqlalchemy-migrate-0.7.1.orig/migrate/tests/fixture/shell.py sqlalchemy-migrate-0.7.1/migrate/tests/fixture/shell.py
+--- sqlalchemy-migrate-0.7.1.orig/migrate/tests/fixture/shell.py 2013-01-22 16:38:23.515225096 +0000
++++ sqlalchemy-migrate-0.7.1/migrate/tests/fixture/shell.py 2013-01-22 16:39:03.189336944 +0000
+@@ -25,9 +25,9 @@
)
def run_version(self, repos_path):
@@ -29,11 +13,10 @@ Index: migrate/tests/fixture/shell.py
- 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())
-Index: migrate/tests/versioning/test_shell.py
-===================================================================
---- migrate/tests/versioning/test_shell.py.orig
-+++ migrate/tests/versioning/test_shell.py
-@@ -25,15 +25,15 @@ class TestShellCommands(Shell):
+diff -Naur sqlalchemy-migrate-0.7.1.orig/migrate/tests/versioning/test_shell.py sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_shell.py
+--- sqlalchemy-migrate-0.7.1.orig/migrate/tests/versioning/test_shell.py 2013-01-22 16:38:23.520225111 +0000
++++ sqlalchemy-migrate-0.7.1/migrate/tests/versioning/test_shell.py 2013-01-22 16:39:03.195336962 +0000
+@@ -21,15 +21,15 @@
def test_help(self):
"""Displays default help dialog"""
@@ -53,7 +36,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertTrue(isinstance(result.stdout, basestring))
self.assertTrue(result.stdout)
self.assertFalse(result.stderr)
-@@ -41,10 +41,10 @@ class TestShellCommands(Shell):
+@@ -37,10 +37,10 @@
def test_shutdown_logging(self):
"""Try to shutdown logging output"""
repos = self.tmp_repos()
@@ -67,7 +50,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertEqual(result.stdout, '')
# TODO: assert logging messages to 0
-@@ -89,7 +89,7 @@ class TestShellCommands(Shell):
+@@ -94,7 +94,7 @@
repos = self.tmp_repos()
# Creating a file that doesn't exist should succeed
@@ -76,7 +59,7 @@ Index: migrate/tests/versioning/test_shell.py
# Files should actually be created
self.assert_(os.path.exists(repos))
-@@ -99,35 +99,35 @@ class TestShellCommands(Shell):
+@@ -104,35 +104,35 @@
self.assertNotEquals(repos_.config.get('db_settings', 'version_table'), 'None')
# Can't create it again: it already exists
@@ -120,7 +103,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assert_(os.path.exists('%s/versions/002_postgres_upgrade.sql' % repos))
self.assert_(os.path.exists('%s/versions/002_postgres_downgrade.sql' % repos))
-@@ -139,7 +139,7 @@ class TestShellCommands(Shell):
+@@ -144,7 +144,7 @@
self.assert_(not os.path.exists(script))
# No attempt is made to verify correctness of the repository path here
@@ -129,7 +112,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assert_(os.path.exists(script))
-@@ -150,41 +150,41 @@ class TestShellRepository(Shell):
+@@ -155,41 +155,41 @@
"""Create repository, python change script"""
super(TestShellRepository, self).setUp()
self.path_repos = self.tmp_repos()
@@ -180,7 +163,7 @@ Index: migrate/tests/versioning/test_shell.py
(filename, self.path_repos))
self.assert_(os.path.exists(filename))
fd = open(filename)
-@@ -204,17 +204,17 @@ class TestShellDatabase(Shell, DB):
+@@ -209,17 +209,17 @@
"""Ensure we can set version control on a database"""
path_repos = repos = self.tmp_repos()
url = self.url
@@ -203,7 +186,7 @@ Index: migrate/tests/versioning/test_shell.py
% locals(), expect_error=True)
self.assertEqual(result.returncode, 1)
-@@ -223,41 +223,41 @@ class TestShellDatabase(Shell, DB):
+@@ -228,41 +228,41 @@
"""Commands with default arguments set by manage.py"""
path_repos = repos = self.tmp_repos()
url = self.url
@@ -256,7 +239,7 @@ Index: migrate/tests/versioning/test_shell.py
@usedb()
def test_upgrade(self):
-@@ -265,67 +265,67 @@ class TestShellDatabase(Shell, DB):
+@@ -270,67 +270,67 @@
# Create a repository
repos_name = 'repos_name'
repos_path = self.tmp()
@@ -345,7 +328,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertEquals(self.run_version(repos_path), 1)
self.assertEquals(len(os.listdir(os.path.join(repos_path, 'versions'))), beforeCount + 2)
-@@ -335,11 +335,11 @@ class TestShellDatabase(Shell, DB):
+@@ -340,11 +340,11 @@
self.assertEquals(self.run_db_version(self.url, repos_path), 0)
self.assertRaises(Exception, self.engine.text('select * from t_table').execute)
@@ -359,7 +342,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertEquals(self.run_db_version(self.url, repos_path), 0)
self.assertRaises(Exception, self.engine.text('select * from t_table').execute)
-@@ -379,15 +379,15 @@ class TestShellDatabase(Shell, DB):
+@@ -384,15 +384,15 @@
repos_name = 'repos_name'
repos_path = self.tmp()
@@ -380,7 +363,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertEquals(self.run_version(repos_path), 1)
self.assertEquals(self.run_db_version(self.url, repos_path), 0)
-@@ -409,7 +409,7 @@ class TestShellDatabase(Shell, DB):
+@@ -414,7 +414,7 @@
file.write(script_text)
file.close()
@@ -389,7 +372,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertEqual(result.returncode, 2)
self.assertEquals(self.run_version(repos_path), 1)
self.assertEquals(self.run_db_version(self.url, repos_path), 0)
-@@ -440,7 +440,7 @@ class TestShellDatabase(Shell, DB):
+@@ -445,7 +445,7 @@
file = open(script_path, 'w')
file.write(script_text)
file.close()
@@ -398,7 +381,7 @@ Index: migrate/tests/versioning/test_shell.py
self.assertEquals(self.run_version(repos_path), 1)
self.assertEquals(self.run_db_version(self.url, repos_path), 0)
-@@ -460,19 +460,19 @@ class TestShellDatabase(Shell, DB):
+@@ -465,19 +465,19 @@
self.meta.reflect()
self.meta.drop_all() # in case junk tables are lying around in the test database
@@ -421,9 +404,9 @@ Index: migrate/tests/versioning/test_shell.py
- 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.assert_("tables missing in database: tmp_account_rundiffs" in result.stdout)
+ self.assert_("tables missing from database: tmp_account_rundiffs" in result.stdout)
-@@ -482,7 +482,7 @@ class TestShellDatabase(Shell, DB):
+@@ -487,7 +487,7 @@
else:
warnings = None
self.env.environ['PYTHONWARNINGS'] = 'default'
@@ -432,8 +415,8 @@ Index: migrate/tests/versioning/test_shell.py
% (self.url, repos_path, model_module.replace(":", ".")), expect_error=True)
if warnings == None:
del(self.env.environ['PYTHONWARNINGS'])
-@@ -494,19 +494,19 @@ class TestShellDatabase(Shell, DB):
- self.assert_("tables missing in database: tmp_account_rundiffs" in result.stdout)
+@@ -499,19 +499,19 @@
+ self.assert_("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'\
@@ -457,7 +440,7 @@ Index: migrate/tests/versioning/test_shell.py
temp_dict = dict()
exec result.stdout in temp_dict
-@@ -520,10 +520,10 @@ class TestShellDatabase(Shell, DB):
+@@ -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.
@@ -470,7 +453,7 @@ Index: migrate/tests/versioning/test_shell.py
#% (self.url, repos_path, old_model_module, model_module))
#self.assertEqualsIgnoreWhitespace(result_script.stdout,
#'''from sqlalchemy import *
-@@ -550,11 +550,11 @@ class TestShellDatabase(Shell, DB):
+@@ -555,11 +555,11 @@
#tmp_account_rundiffs.drop()''')
## Save the upgrade script.
@@ -484,3 +467,17 @@ Index: migrate/tests/versioning/test_shell.py
#% (self.url, repos_path, model_module))
#self.assert_("No schema diffs" in result.stdout)
+diff -Naur sqlalchemy-migrate-0.7.1.orig/setup.py sqlalchemy-migrate-0.7.1/setup.py
+--- sqlalchemy-migrate-0.7.1.orig/setup.py 2011-05-27 12:26:46.000000000 +0000
++++ sqlalchemy-migrate-0.7.1/setup.py 2013-01-22 16:39:03.189336944 +0000
+@@ -32,8 +32,8 @@
+ license = "MIT",
+ entry_points = """
+ [console_scripts]
+- migrate = migrate.versioning.shell:main
+- migrate-repository = migrate.versioning.migrate_repository:main
++ sqlalchemy-migrate = migrate.versioning.shell:main
++ sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
+ """,
+ test_suite = "nose.collector",
+ )
diff --git a/python-migrate.spec b/python-migrate.spec
index 6b21c28..ea73466 100644
--- a/python-migrate.spec
+++ b/python-migrate.spec
@@ -5,8 +5,8 @@
%global srcname sqlalchemy-migrate
Name: python-migrate
-Version: 0.6
-Release: 6%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
Summary: Schema migration tools for SQLAlchemy
Group: Development/Languages
@@ -17,10 +17,8 @@ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
Patch0: migrate-scripttest-update.patch
# Patch to fix a unittest on python-2.7
Patch1: migrate-py27.patch
-# Fix invalid code causing an exception
-Patch2: migrate-fix-deprecation-warning.patch
-# Support sqlalchemy 0.7
-Patch3: migrate-0.7-compat.patch
+# Patch to fix a unittest whitespace issue
+Patch2: migrate-test-whitespace.patch
# Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
Patch100: python-migrate-sqlalchemy-migrate.patch
@@ -62,9 +60,8 @@ atabase change sets and database repository versioning.
%setup -q -n %{srcname}-%{version}
%patch0 -p1 -b .test
%patch1 -p1 -b .py27
-%patch2 -p1 -b .exception
-%patch3 -p1 -b .compat
-%patch100 -p0 -b .rename
+%patch2 -p1 -b .whitespace
+%patch100 -p1 -b .rename
# use real unittest in python 2.7 and up
%if 0%{?fedora} || 0%{?rhel} > 6
@@ -97,11 +94,14 @@ nosetests
%files
%defattr(-,root,root,-)
-%doc README TODO docs/
+%doc README docs/
%{_bindir}/*
%{python_sitelib}/*
%changelog
+* Tue Jan 22 2013 Pádraig Brady <P at draigBrady.com> - 0.7.1-1
+- Update to 0.7.1
+
* Sun Dec 04 2011 Pádraig Brady <P at draigBrady.com> - 0.6-6
- Fix a crash when trying to issue a deprecation warning
- Backport sqlalchemy 0.7 support
diff --git a/sources b/sources
index 2709451..8b16ac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84a983d9cf15cf9bf5dd1b44785f065a sqlalchemy-migrate-0.6.tar.gz
+023acd2cb74882597074768a0e84468a sqlalchemy-migrate-0.7.1.tar.gz
More information about the scm-commits
mailing list