[python-sqlalchemy/epel7] Update to version 0.9.7
pjp
pjp at fedoraproject.org
Tue Sep 30 16:22:49 UTC 2014
commit 35a7c4336f8850b367a621c69ffa8f757f969aaa
Author: P J P <pjp at fedoraproject.org>
Date: Tue Sep 30 14:50:20 2014 +0530
Update to version 0.9.7
.gitignore | 1 +
python-sqlalchemy-0.9.7-nose-use-build.patch | 20 +++++++
...on-sqlalchemy-0.9.7-types-test-workaround.patch | 12 ++++
python-sqlalchemy.spec | 58 ++++++++++++++++----
sources | 2 +-
5 files changed, 80 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a604ac0..118d657 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ SQLAlchemy-0.6.1.tar.gz
/SQLAlchemy-0.8.2.tar.gz
/SQLAlchemy-0.8.3.tar.gz
/SQLAlchemy-0.8.4.tar.gz
+/SQLAlchemy-0.9.7.tar.gz
diff --git a/python-sqlalchemy-0.9.7-nose-use-build.patch b/python-sqlalchemy-0.9.7-nose-use-build.patch
new file mode 100644
index 0000000..a6ad14f
--- /dev/null
+++ b/python-sqlalchemy-0.9.7-nose-use-build.patch
@@ -0,0 +1,20 @@
+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']:
++for pth in glob.glob('build/lib*'):
+ sys.path.insert(0, path.join(path.dirname(path.abspath(__file__)), pth))
+
+ # installing without importing SQLAlchemy, so that coverage includes
+ # 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):
+ from importlib import machinery
+ noseplugin = machinery.SourceFileLoader("noseplugin", path).load_module()
diff --git a/python-sqlalchemy-0.9.7-types-test-workaround.patch b/python-sqlalchemy-0.9.7-types-test-workaround.patch
new file mode 100644
index 0000000..fe52d58
--- /dev/null
+++ b/python-sqlalchemy-0.9.7-types-test-workaround.patch
@@ -0,0 +1,12 @@
+diff -up SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py.types-test-workaround SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py
+--- SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py.types-test-workaround 2014-07-22 22:54:20.000000000 +0200
++++ SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py 2014-07-29 16:43:27.921221412 +0200
+@@ -3268,7 +3268,7 @@ class _defer_name(_truncated_label):
+ generation.
+
+ """
+- def __new__(cls, value):
++ def __new__(cls, value, *rest):
+ if value is None:
+ return _NONE_NAME
+ elif isinstance(value, conv):
diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec
index e65750a..c01fd85 100644
--- a/python-sqlalchemy.spec
+++ b/python-sqlalchemy.spec
@@ -10,18 +10,21 @@
%global srcname SQLAlchemy
Name: python-sqlalchemy
-Version: 0.8.4
-Release: 1%{?dist}
+Version: 0.9.7
+Release: 3%{?dist}
Summary: Modular and flexible ORM library for python
Group: Development/Libraries
License: MIT
URL: http://www.sqlalchemy.org/
Source0: http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
-Patch0: sqlalchemy-nose-use-build.patch
+Patch0: python-sqlalchemy-0.9.7-nose-use-build.patch
+# Work around failing types test
+# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144
+Patch1: python-sqlalchemy-%{version}-types-test-workaround.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python2-devel
+BuildRequires: python2-devel >= 2.6
BuildRequires: python-setuptools
BuildRequires: python-nose
BuildRequires: python-mock
@@ -65,7 +68,8 @@ This package includes the python 3 version of the module.
%prep
%setup -q -n %{srcname}-%{version}
-%patch0 -p0
+%patch0 -p1 -b .nose-use-build
+%patch1 -p1 -b .types-test-workaround
%if 0%{?with_python3}
rm -rf %{py3dir}
@@ -73,14 +77,12 @@ cp -a . %{py3dir}
%endif # with_python3
%build
+sed -i 1d lib/sqlalchemy/testing/runner.py
CFLAGS="%{optflags}" %{__python} setup.py --with-cextensions build
%if 0%{?with_python3}
pushd %{py3dir}
-# Convert tests and examples to python3
-%{__python3} sa2to3.py --no-diffs -w test examples
-# Currently the cextension doesn't work with python3
-CFLAGS="%{optflags}" %{__python3} setup.py build
+CFLAGS="%{optflags}" %{__python3} setup.py --with-cextensions build
popd
%endif
@@ -93,8 +95,7 @@ mkdir -p %{buildroot}%{python_sitelib}
%if 0%{?with_python3}
pushd %{py3dir}
mkdir -p %{buildroot}%{python3_sitelib}
-# Currently the cextension doesn't work with python3
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%{__python3} setup.py --with-cextensions install --skip-build --root %{buildroot}
popd
%endif
@@ -123,10 +124,43 @@ popd
%files -n python3-sqlalchemy
%defattr(-,root,root,-)
%doc LICENSE PKG-INFO doc examples
-%{python3_sitelib}/*
+%{python3_sitearch}/*
%endif # with_python3
%changelog
+* Tue Sep 30 2014 P J P <pjp at fedoraproject.org> - 0.9.7-3
+- Fixed rpmlint error improper permissions ../testing/runner.py
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jul 29 2014 Nils Philippsen <nils at redhat.com> - 0.9.7-1
+- version 0.9.7, upstream feature and bugfix release
+
+* Mon Jun 30 2014 Nils Philippsen <nils at redhat.com> - 0.9.6-1
+- version 0.9.6, upstream feature and bugfix release
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 16 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 0.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
+* Thu May 15 2014 Nils Philippsen <nils at redhat.com> - 0.9.4-1
+- version 0.9.4, upstream feature and bugfix release
+
+* Thu Feb 20 2014 Nils Philippsen <nils at redhat.com> - 0.9.3-1
+- version 0.9.3, upstream feature and bugfix release
+
+* Wed Feb 05 2014 Nils Philippsen <nils at redhat.com> - 0.9.2-1
+- version 0.9.2, upstream feature and bugfix release
+
+* Tue Jan 07 2014 Nils Philippsen <nils at redhat.com> - 0.9.1-1
+- version 0.9.1, upstream feature and bugfix release
+- no need to use 2to3 for python 3.x anymore
+- build C extension for python 3.x
+- require python2-devel >= 2.6 for building
+
* Mon Dec 09 2013 Nils Philippsen <nils at redhat.com> - 0.8.4-1
- version 0.8.4, upstream bugfix release
diff --git a/sources b/sources
index cb342a2..f2c1a58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd517e1bb4031cac1e3fa00108111b38 SQLAlchemy-0.8.4.tar.gz
+e3c8f836ea9b48886718f59b9d8646ff SQLAlchemy-0.9.7.tar.gz
More information about the scm-commits
mailing list