diff --git a/.gitignore b/.gitignore index 5d38f29..2be3a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ SQLAlchemy-0.6.1.tar.gz /SQLAlchemy-0.9.3.tar.gz /SQLAlchemy-0.9.4.tar.gz /SQLAlchemy-0.9.6.tar.gz +/SQLAlchemy-0.9.7.tar.gz diff --git a/python-sqlalchemy-0.9.6-nose-use-build.patch b/python-sqlalchemy-0.9.7-nose-use-build.patch similarity index 63% rename from python-sqlalchemy-0.9.6-nose-use-build.patch rename to python-sqlalchemy-0.9.7-nose-use-build.patch index 3666976..a6ad14f 100644 --- a/python-sqlalchemy-0.9.6-nose-use-build.patch +++ b/python-sqlalchemy-0.9.7-nose-use-build.patch @@ -1,11 +1,10 @@ -diff -up SQLAlchemy-0.9.6/sqla_nose.py.nose-use-build SQLAlchemy-0.9.6/sqla_nose.py ---- SQLAlchemy-0.9.6/sqla_nose.py.nose-use-build 2014-06-30 13:06:27.857585522 +0200 -+++ SQLAlchemy-0.9.6/sqla_nose.py 2014-06-30 13:09:12.421227808 +0200 -@@ -10,14 +10,14 @@ import sys - import nose +diff -up SQLAlchemy-0.9.7/sqla_nose.py.nose-use-build SQLAlchemy-0.9.7/sqla_nose.py +--- SQLAlchemy-0.9.7/sqla_nose.py.nose-use-build 2014-07-29 13:07:44.151453336 +0200 ++++ SQLAlchemy-0.9.7/sqla_nose.py 2014-07-29 13:09:15.096785664 +0200 +@@ -11,13 +11,14 @@ import nose import warnings -- + +import glob from os import path -for pth in ['./lib']: @@ -16,6 +15,6 @@ diff -up SQLAlchemy-0.9.6/sqla_nose.py.nose-use-build SQLAlchemy-0.9.6/sqla_nose # SQLAlchemy itself. -path = "lib/sqlalchemy/testing/plugin/noseplugin.py" +path = glob.glob("build/lib*/sqlalchemy/testing/plugin/noseplugin.py")[0] - if sys.version_info >= (3,3): + if sys.version_info >= (3, 3): from importlib import machinery noseplugin = machinery.SourceFileLoader("noseplugin", path).load_module() diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec index 82cff4f..d008b60 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -10,7 +10,7 @@ %global srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.9.6 +Version: 0.9.7 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -18,7 +18,7 @@ Group: Development/Libraries License: MIT URL: http://www.sqlalchemy.org/ Source0: http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz -Patch0: python-sqlalchemy-0.9.6-nose-use-build.patch +Patch0: python-sqlalchemy-0.9.7-nose-use-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python2-devel >= 2.6 @@ -123,6 +123,9 @@ popd %endif # with_python3 %changelog +* Tue Jul 29 2014 Nils Philippsen - 0.9.7-1 +- version 0.9.7, upstream feature and bugfix release + * Mon Jun 30 2014 Nils Philippsen - 0.9.6-1 - version 0.9.6, upstream feature and bugfix release diff --git a/sources b/sources index a71d788..f2c1a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8494d85834ba6a465b4a32078d36ee8 SQLAlchemy-0.9.6.tar.gz +e3c8f836ea9b48886718f59b9d8646ff SQLAlchemy-0.9.7.tar.gz