update nose-use-build patch
This commit is contained in:
parent
326c7707c7
commit
1622a48cd7
@ -1,7 +1,7 @@
|
|||||||
diff -up SQLAlchemy-0.9.4/sqla_nose.py.nose-use-build SQLAlchemy-0.9.4/sqla_nose.py
|
diff -up SQLAlchemy-0.9.6/sqla_nose.py.nose-use-build SQLAlchemy-0.9.6/sqla_nose.py
|
||||||
--- SQLAlchemy-0.9.4/sqla_nose.py.nose-use-build 2014-03-29 00:28:17.000000000 +0100
|
--- SQLAlchemy-0.9.6/sqla_nose.py.nose-use-build 2014-06-30 13:06:27.857585522 +0200
|
||||||
+++ SQLAlchemy-0.9.4/sqla_nose.py 2014-05-15 10:12:18.260041402 +0200
|
+++ SQLAlchemy-0.9.6/sqla_nose.py 2014-06-30 13:09:12.421227808 +0200
|
||||||
@@ -11,14 +11,15 @@ import imp
|
@@ -10,14 +10,14 @@ import sys
|
||||||
import nose
|
import nose
|
||||||
import warnings
|
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
|
+import glob
|
||||||
from os import path
|
from os import path
|
||||||
-for pth in ['./lib']:
|
-for pth in ['./lib']:
|
||||||
+
|
|
||||||
+for pth in glob.glob('build/lib*'):
|
+for pth in glob.glob('build/lib*'):
|
||||||
sys.path.insert(0, path.join(path.dirname(path.abspath(__file__)), pth))
|
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.
|
# SQLAlchemy itself.
|
||||||
-path = "lib/sqlalchemy/testing/plugin/noseplugin.py"
|
-path = "lib/sqlalchemy/testing/plugin/noseplugin.py"
|
||||||
+path = glob.glob("build/lib*/sqlalchemy/testing/plugin/noseplugin.py")[0]
|
+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()
|
@ -18,7 +18,7 @@ Group: Development/Libraries
|
|||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.sqlalchemy.org/
|
URL: http://www.sqlalchemy.org/
|
||||||
Source0: http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: python2-devel >= 2.6
|
BuildRequires: python2-devel >= 2.6
|
||||||
|
Loading…
Reference in New Issue
Block a user