version 0.8.2, upstream bugfix release

drop obsolete sqlalchemy-test-bidirectional-order patch and remove
unused patches
This commit is contained in:
Nils Philippsen 2013-08-14 17:46:52 +02:00
parent 45200152f8
commit 99e2384a3f
6 changed files with 9 additions and 59 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ SQLAlchemy-0.6.1.tar.gz
/SQLAlchemy-0.8.0b1.tar.gz
/SQLAlchemy-0.8.0.tar.gz
/SQLAlchemy-0.8.1.tar.gz
/SQLAlchemy-0.8.2.tar.gz

View File

@ -10,8 +10,8 @@
%global srcname SQLAlchemy
Name: python-sqlalchemy
Version: 0.8.1
Release: 2%{?dist}
Version: 0.8.2
Release: 1%{?dist}
Summary: Modular and flexible ORM library for python
Group: Development/Libraries
@ -19,12 +19,12 @@ 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
Patch1: sqlalchemy-test-bidirectional-order.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: python-nose
BuildRequires: python-mock
%if 0%{?with_python3}
BuildRequires: python3-devel
@ -66,7 +66,6 @@ This package includes the python 3 version of the module.
%prep
%setup -q -n %{srcname}-%{version}
%patch0 -p0
%patch1 -p1
%if 0%{?with_python3}
rm -rf %{py3dir}
@ -128,6 +127,10 @@ popd
%endif # with_python3
%changelog
* Wed Aug 14 2013 Nils Philippsen <nils@redhat.com> - 0.8.2-1
- version 0.8.2, upstream bugfix release
- drop obsolete sqlalchemy-test-bidirectional-order patch
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
65d1f3a9f25f3cd558b6001b11392ce1 SQLAlchemy-0.8.1.tar.gz
5a33fb43dea93468dbb2a6562ee80b54 SQLAlchemy-0.8.2.tar.gz

View File

@ -1,12 +0,0 @@
diff -r 73b9d2cfde34 MANIFEST.in
--- a/MANIFEST.in Sun Aug 12 21:07:24 2012 -0400
+++ b/MANIFEST.in Mon Aug 13 10:01:10 2012 -0700
@@ -3,7 +3,7 @@
recursive-include doc *.html *.css *.txt *.js *.jpg *.png *.py Makefile *.rst *.mako *.sty
recursive-include examples *.py *.xml
-recursive-include test *.py *.dat
+recursive-include test *.py *.dat *.txt
# include the c extensions, which otherwise
# don't come in if --with-cextensions isn't specified.

View File

@ -1,16 +0,0 @@
diff -up SQLAlchemy-0.8.1/test/orm/test_manytomany.py.bak SQLAlchemy-0.8.1/test/orm/test_manytomany.py
--- SQLAlchemy-0.8.1/test/orm/test_manytomany.py.bak 2013-04-29 18:05:36.721189243 -0700
+++ SQLAlchemy-0.8.1/test/orm/test_manytomany.py 2013-04-29 18:06:07.754995799 -0700
@@ -244,10 +244,10 @@ class M2MTest(fixtures.MappedTest):
sess.add_all((t1, t2, t3, p1, p2, p3))
sess.commit()
- self.assert_result([t1],
+ self.assert_unordered_result([t1],
Transition, {'outputs':
(Place, [{'name': 'place3'}, {'name': 'place1'}])})
- self.assert_result([p2],
+ self.assert_unordered_result([p2],
Place, {'inputs':
(Transition, [{'name': 'transition1'},
{'name': 'transition2'}])})

View File

@ -1,26 +0,0 @@
Index: SQLAlchemy-0.8.0/test/dialect/test_postgresql.py
===================================================================
--- SQLAlchemy-0.8.0.orig/test/dialect/test_postgresql.py
+++ SQLAlchemy-0.8.0/test/dialect/test_postgresql.py
@@ -2836,8 +2836,8 @@ class HStoreTest(fixtures.TestBase):
dialect = default.DefaultDialect()
proc = self.test_table.c.hash.type._cached_bind_processor(dialect)
eq_(
- proc({"key1": "value1", "key2": "value2"}),
- '"key2"=>"value2", "key1"=>"value1"'
+ ', '.join(sorted(proc({"key1": "value1", "key2": "value2"}).split(', '))),
+ '"key1"=>"value1", "key2"=>"value2"'
)
def test_parse_error(self):
@@ -2878,8 +2878,8 @@ class HStoreTest(fixtures.TestBase):
dialect._has_native_hstore = False
proc = self.test_table.c.hash.type._cached_bind_processor(dialect)
eq_(
- proc({"key1": "value1", "key2": "value2"}),
- '"key2"=>"value2", "key1"=>"value1"'
+ ', '.join(sorted(proc({"key1": "value1", "key2": "value2"}).split(', '))),
+ '"key1"=>"value1", "key2"=>"value2"'
)
def test_result_deserialize_psycopg2(self):