[python-migrate0.5: 1/2] Update to new upstream bugfix release

Mon Jul 18 02:31:35 UTC 2011

commit fa0dd58b08582fbdb4811c979a1749d2b051b14c
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sun Jul 17 19:28:52 2011 -0700

    Update to new upstream bugfix release

 .gitignore                              |    1 +
 python-migrate-sqlalchemy-migrate.patch |   11 ++++++-----
 python-migrate0.5-SA0.5.patch           |   30 ++++++++++++++++++------------
 python-migrate0.5.spec                  |   15 +++++++++------
 sources                                 |    2 +-
 5 files changed, 35 insertions(+), 24 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fc76b27..2a5fde5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 sqlalchemy-migrate-0.5.3.tar.gz
+/sqlalchemy-migrate-0.5.4.tar.gz
diff --git a/python-migrate-sqlalchemy-migrate.patch b/python-migrate-sqlalchemy-migrate.patch
index 7a689c6..226641f 100644
--- a/python-migrate-sqlalchemy-migrate.patch
+++ b/python-migrate-sqlalchemy-migrate.patch
@@ -1,7 +1,8 @@
-diff -up sqlalchemy-migrate-0.5.3/setup.py.bak sqlalchemy-migrate-0.5.3/setup.py
---- sqlalchemy-migrate-0.5.3/setup.py.bak	2009-04-16 10:52:18.000000000 -0700
-+++ sqlalchemy-migrate-0.5.3/setup.py	2009-04-16 10:52:43.000000000 -0700
-@@ -40,8 +40,8 @@ Migrate extends SQLAlchemy to have datab
+Index: sqlalchemy-migrate-0.5.4/setup.py
+===================================================================
+--- sqlalchemy-migrate-0.5.4.orig/setup.py
++++ sqlalchemy-migrate-0.5.4/setup.py
+@@ -41,8 +41,8 @@ Migrate extends SQLAlchemy to have datab
  
      entry_points = """
      [console_scripts]
@@ -11,4 +12,4 @@ diff -up sqlalchemy-migrate-0.5.3/setup.py.bak sqlalchemy-migrate-0.5.3/setup.py
 +    sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
      """,
      test_suite = "nose.collector",
-     tests_require = test_requirements,
+ )
diff --git a/python-migrate0.5-SA0.5.patch b/python-migrate0.5-SA0.5.patch
index 63ccaa7..6c68898 100644
--- a/python-migrate0.5-SA0.5.patch
+++ b/python-migrate0.5-SA0.5.patch
@@ -1,5 +1,7 @@
---- setup.py.sa05	2009-10-13 14:51:58.370161269 -0400
-+++ setup.py	2009-10-13 14:51:58.380161453 -0400
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
 @@ -1,4 +1,7 @@
  #!/usr/bin/python
 +__requires__='SQLAlchemy>=0.5'
@@ -8,8 +10,10 @@
  
  try:
      from setuptools import setup, find_packages
---- migrate/__init__.py.sa05	2009-02-07 17:05:21.000000000 -0500
-+++ migrate/__init__.py	2009-10-13 14:51:58.376161170 -0400
+Index: migrate/__init__.py
+===================================================================
+--- migrate/__init__.py.orig
++++ migrate/__init__.py
 @@ -4,3 +4,6 @@
     :mod:`migrate.changeset` that allows to define database schema changes
     using Python.
@@ -17,12 +21,14 @@
 +import __main__; __main__.__requires__ = __requires__ = 'SQLAlchemy>=0.5'
 +import pkg_resources
 +pkg_resources.require('SQLAlchemy>=0.5'); import sqlalchemy; print sqlalchemy
---- ./test/versioning/test_shell.py.sa05	2009-02-18 14:27:09.000000000 -0500
-+++ ./test/versioning/test_shell.py	2009-10-13 14:51:58.380161453 -0400
-@@ -14,6 +14,20 @@
-     _cmd=os.path.join('python migrate', 'versioning', 'shell.py')
+Index: test/versioning/test_shell.py
+===================================================================
+--- test/versioning/test_shell.py.orig
++++ test/versioning/test_shell.py
+@@ -24,6 +24,20 @@ class Shell(fixture.Shell):
+ 
      @classmethod
-     def cmd(cls,*p):
+     def cmd(cls, *args):
 +        # Munge the PYTHONPATH so we find the correct version of sqlalchemy.
 +        # In production, the setuptools generated wrapper for the entrypoint
 +        # would take care of this
@@ -37,6 +43,6 @@
 +        # In case of an empty PYTHONPATH
 +        py_path_list = [path for path in py_path_list if path]
 +        os.environ['PYTHONPATH'] = ':'.join(py_path_list)
-         p = map(lambda s: str(s),p)
-         ret = ' '.join([cls._cmd]+p)
-         return ret
+         safe_parameters = map(lambda arg: str(arg), args)
+         return ' '.join([cls._cmd] + safe_parameters)
+ 
diff --git a/python-migrate0.5.spec b/python-migrate0.5.spec
index 29fe690..8ead1b5 100644
--- a/python-migrate0.5.spec
+++ b/python-migrate0.5.spec
@@ -3,8 +3,8 @@
 %global srcname sqlalchemy-migrate
 
 Name: python-migrate0.5
-Version: 0.5.3
-Release: 8%{?dist}
+Version: 0.5.4
+Release: 1%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
 Group: Development/Languages
@@ -13,17 +13,18 @@ URL: http://code.google.com/p/%{srcname}/
 Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
 Patch0: python-migrate-sqlalchemy-migrate.patch
-Patch1: python-migrate-py2.4-import.patch
 Patch2: python-migrate0.5-SA0.5.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: python2-devel
 BuildRequires: python-sqlite2
-BuildRequires: python-setuptools-devel
+BuildRequires: python-setuptools
 BuildRequires: python-nose
 BuildRequires: python-sphinx
+BuildRequires: python-decorator
+Requires: python-decorator
 %if 0%{?fedora}
 # Fedora has SA-0.5 in a compat package
 BuildRequires: python-sqlalchemy0.5
@@ -43,7 +44,6 @@ database change sets and database repository versioning.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .rename
-%patch1 -p0 -b .import
 %patch2 -p0 -b .sa05
 
 %build
@@ -73,6 +73,9 @@ echo 'sqlite:///__tmp__' > test_db.cfg
 %{python_sitelib}/*
 
 %changelog
+* Fri Jul 15 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.4-1
+- Update to new upstream bugfix release
+
 * Thu Jan 13 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-8
 - Fix Requires on sqlalchemy0.5 -- no need for the compat version of
   SQLAlchemy on epel.
diff --git a/sources b/sources
index 782fc24..1f64cf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ce48470efac8cbcdf4ee9af725efd70  sqlalchemy-migrate-0.5.3.tar.gz
+7ad9e6d6dd6df701fc596bcb87380271  sqlalchemy-migrate-0.5.4.tar.gz
