From 1622a48cd7f42f71d81ed16110fd7c07afb45903 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 30 Jun 2014 13:11:54 +0200 Subject: [PATCH] update nose-use-build patch --- ...> python-sqlalchemy-0.9.6-nose-use-build.patch | 15 +++++++-------- python-sqlalchemy.spec | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) rename python-sqlalchemy-0.9.4-nose-use-build.patch => python-sqlalchemy-0.9.6-nose-use-build.patch (51%) diff --git a/python-sqlalchemy-0.9.4-nose-use-build.patch b/python-sqlalchemy-0.9.6-nose-use-build.patch similarity index 51% rename from python-sqlalchemy-0.9.4-nose-use-build.patch rename to python-sqlalchemy-0.9.6-nose-use-build.patch index c938f3c..3666976 100644 --- a/python-sqlalchemy-0.9.4-nose-use-build.patch +++ b/python-sqlalchemy-0.9.6-nose-use-build.patch @@ -1,7 +1,7 @@ -diff -up SQLAlchemy-0.9.4/sqla_nose.py.nose-use-build SQLAlchemy-0.9.4/sqla_nose.py ---- SQLAlchemy-0.9.4/sqla_nose.py.nose-use-build 2014-03-29 00:28:17.000000000 +0100 -+++ SQLAlchemy-0.9.4/sqla_nose.py 2014-05-15 10:12:18.260041402 +0200 -@@ -11,14 +11,15 @@ import imp +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 import warnings @@ -9,7 +9,6 @@ diff -up SQLAlchemy-0.9.4/sqla_nose.py.nose-use-build SQLAlchemy-0.9.4/sqla_nose +import glob from os import path -for pth in ['./lib']: -+ +for pth in glob.glob('build/lib*'): sys.path.insert(0, path.join(path.dirname(path.abspath(__file__)), pth)) @@ -17,6 +16,6 @@ diff -up SQLAlchemy-0.9.4/sqla_nose.py.nose-use-build SQLAlchemy-0.9.4/sqla_nose # SQLAlchemy itself. -path = "lib/sqlalchemy/testing/plugin/noseplugin.py" +path = glob.glob("build/lib*/sqlalchemy/testing/plugin/noseplugin.py")[0] - noseplugin = imp.load_source("noseplugin", path) - - + 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 d431e4d..82cff4f 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -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.4-nose-use-build.patch +Patch0: python-sqlalchemy-0.9.6-nose-use-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python2-devel >= 2.6