[python-alembic: 9/9] Merge branch 'epel7'

[Ralph Bean]

commit f0d69a4878f2fa828388728cbbaa728ad710b263
Merge: 179f7a5 5c21c8e
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Mar 16 15:35:08 2015 -0400

    Merge branch 'epel7'
    
    Conflicts:
    	python-alembic.spec

 python-alembic.spec | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
---
diff --cc python-alembic.spec
index f08a850,487083e..7ab3a5c
--- a/python-alembic.spec
+++ b/python-alembic.spec
@@@ -11,8 -5,8 +11,8 @@@
  %global modname alembic
  
  Name:             python-alembic
 -Version:          0.4.2
 -Release:          3%{?dist}
 +Version:          0.7.4
- Release:          1%{?dist}
++Release:          2%{?dist}
  Summary:          Database migration tool for SQLAlchemy
  
  Group:            Development/Libraries
@@@ -27,7 -22,7 +27,8 @@@ BuildRequires:    help2ma
  BuildRequires:    python2-devel
  BuildRequires:    python-mako
  BuildRequires:    python-setuptools
 +BuildRequires:    python-mock
+ 
  Requires:         python-mako
  Requires:         python-setuptools
  
@@@ -148,14 -142,24 +149,21 @@@ install -d -m 0755 %{buildroot}%{_mandi
  
  %if 0%{?with_python3}
  pushd %{py3dir}
- %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
+ %{__python3} setup.py install --skip-build --root=%{buildroot}
  mv %{buildroot}/%{_bindir}/%{modname} %{buildroot}/%{_bindir}/python3-%{modname}
 -%if %{?rhel}%{!?rhel:0} <= 6
 -%else
  install -m 0644 python3-alembic.1 %{buildroot}%{_mandir}/man1/python3-alembic.1
  popd
  %endif
  
 -%{__python} setup.py install --skip-build --root=%{buildroot}
 -%if %{?rhel}%{!?rhel:0} <= 6
 +%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 +%if 0%{?rhel} && 0%{?rhel} <= 6
+ # Modify /usr/bin/alembic to require SQLAlchemy>=0.6
+ # Hacky but setuptools only creates this file after setup.py install is run :-(
+ # Root cause is that setuptools doesn't recurse the requirements when it processes
+ # the __requires__.  It waits until pkg_resources.require('MODULE') is called.
+ # Since that isn't done in the entrypoints script, we need to specify the dependency
+ # on a specific SQLAlchemy version explicitly.
+ sed -i -e "s|__requires__ = 'alembic==0.4.2'|__requires__ = ['alembic==0.4.2', 'SQLAlchemy>=0.6']|" %{buildroot}%{_bindir}/%{modname}
  %else
  install -m 0644 alembic.1 %{buildroot}%{_mandir}/man1/alembic.1
  %endif
@@@ -190,48 -195,20 +198,53 @@@ pop
  %{_mandir}/man1/python3-alembic.1*
  %endif
  
 -%endif
 -
  
  %changelog
- * Sat Feb 21 2015 Ralph Bean <rbean at redhat.com> - 0.7.4-1
- - new version
 -* Mon Jul 29 2013 Ralph Bean <rbean at redhat.com> - 0.4.2-3
 -- Add forgotten dep on python-setuptools.
++* Mon Mar 16 2015 Ralph Bean <rbean at redhat.com> - 0.7.4-2
++- Merge in epel7 compat changes to the spec file.
++- Drop patch for epel7, no longer needed with modern upstream.
 +
 +* Sat Feb 21 2015 Ralph Bean <rbean at redhat.com> - 0.7.4-1
 +- new version
 +- No longer using 2to3.
 +
 +* Wed Aug 20 2014 Ralph Bean <rbean at redhat.com> - 0.6.6-1
 +- Latest upstream.
 +- Modernized python macros.
 +- Re-enabled python3 tests.
 +- Cleaned up the description formatting.
 +
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* Tue May 27 2014 Kalev Lember <kalevlember at gmail.com> - 0.6.5-2
 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
 +
 +* Tue May 06 2014 Ralph Bean <rbean at redhat.com> - 0.6.5-1
 +- Latest upstream.
 +
 +* Tue Feb 04 2014 Ralph Bean <rbean at redhat.com> - 0.6.3-1
 +- Latest upstream.
 +
 +* Tue Jan 28 2014 Ralph Bean <rbean at redhat.com> - 0.6.2-2
 +- Simplify some nested conditionals.
 +- Attempt a better rhel conditional.
 +- Added buildtime dep on python-mock for the test suite.
 +
 +* Tue Jan 28 2014 Ralph Bean <rbean at redhat.com> - 0.6.2-1
 +- Latest upstream.
 +
 +* Mon Jul 29 2013 Ralph Bean <rbean at redhat.com> - 0.5.0-2
 +- Add forgotten dependency on python-setuptools.
 +  https://bugzilla.redhat.com/show_bug.cgi?id=989016
  
+ * Wed May 29 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.4.2-2
+ - Workaround setuptools to load the correct SQLAlchemy version for
+   the alembic script. https://bugzilla.redhat.com/show_bug.cgi?id=968404
+ 
 +* Wed Apr 10 2013 Ralph Bean <rbean at redhat.com> - 0.5.0-1
 +- Update to 0.5.0
 +
  * Thu Mar 14 2013 Pádraig Brady <pbrady at redhat.com> - 0.4.2-1
  - Update to 0.4.2