diff --git a/python-migrate-shell-test.patch b/python-migrate-shell-test.patch deleted file mode 100644 index 05fc47d..0000000 --- a/python-migrate-shell-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env sqlalchemy-migrate-0.4.4/test/fixture/shell.py ---- sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env 2008-04-04 13:44:09.000000000 -0700 -+++ sqlalchemy-migrate-0.4.4/test/fixture/shell.py 2008-07-02 13:31:51.000000000 -0700 -@@ -12,7 +12,15 @@ class Shell(Pathed): - return command - # Redirect stderr to stdout - # This is a bit of a hack, but I've not found a better way -+ py_path = os.environ.get('PYTHONPATH', '') -+ py_path_list = py_path.split(':') -+ py_path_list.append(os.path.abspath('.')) -+ os.environ['PYTHONPATH'] = ':'.join(py_path_list) - fd=os.popen(command+' 2>&1',*p,**k) -+ if py_path: -+ py_path = os.environ['PYTHONPATH'] = py_path -+ else: -+ del os.environ['PYTHONPATH'] - return fd - def output_and_exitcode(self,*p,**k): - fd=self.execute(*p,**k) diff --git a/python-migrate.spec b/python-migrate.spec index 2282f86..77eb322 100644 --- a/python-migrate.spec +++ b/python-migrate.spec @@ -4,15 +4,13 @@ Name: python-migrate Version: 0.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz -# Fix a test when migrate is not installed. Applied upstream. -Patch0: python-migrate-shell-test.patch # Local patch to disable py.test. Needed until py.test is in Fedora. Patch1: python-migrate-disable-pytest.patch @@ -31,7 +29,6 @@ atabase change sets and database repository versioning. %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 -b .env %patch1 -p1 -b .pytest %build @@ -59,6 +56,9 @@ atabase change sets and database repository versioning. %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 +- Remove patches that are merged upstream. + * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-1 - New upstream