diff --git a/.gitignore b/.gitignore index 8b6e49f..0e4624b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ SQLAlchemy-0.6.1.tar.gz /SQLAlchemy-0.7.8.tar.gz /SQLAlchemy-0.7.9dev.tar.gz /SQLAlchemy-0.8.0b1.tar.gz +/SQLAlchemy-0.8.0.tar.gz diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec index 9353ddd..46e2163 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -11,23 +11,14 @@ Name: python-sqlalchemy Version: 0.8.0 -Release: 0.2.b1%{?dist} +Release: 1%{?dist} Summary: Modular and flexible ORM library for python Group: Development/Libraries License: MIT URL: http://www.sqlalchemy.org/ -# hg clone -u rel_0_7 -r 8535 http://hg.sqlalchemy.org/sqlalchemy -# cd sqlalchemy -# Apply Patch100 -# python setup.py sdist -# tarball will be in the dist/ subdirectory -# Package a snapshot of 0.7 to fix unittests on python3.3 -Source0: http://downloads.sf.net/%{srcname}/%{srcname}-%{version}b1.tar.gz -#Source0: http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}b1.tar.gz -#Source0: SQLAlchemy-0.7.9dev.tar.gz -# This is just necessary for setup.py sdist in the current snapshot -#Patch100: sqlalchemy-include-profiling-data-file.patch +Source0: http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz +Patch0: sqlalchemy-unittest-ordering.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python2-devel @@ -69,14 +60,11 @@ This package includes the python 3 version of the module. %endif # with_python3 # Filter unnecessary dependencies -%{?filter_setup: -%filter_provides_in %{python_sitearch}.*\.so$ -%filter_provides_in %{python3_sitearch}.*\.so$ -%filter_setup -} +%global __provides_exclude_from ^(%{python_sitearch}|%{python3_sitearch})/.*\\.so$ %prep -%setup -q -n %{srcname}-0.8.0b1 +%setup -q -n %{srcname}-0.8.0 +%patch0 -p1 -b .ordering %if 0%{?with_python3} rm -rf %{py3dir} @@ -90,7 +78,7 @@ CFLAGS="%{optflags}" %{__python} setup.py --with-cextensions build pushd %{py3dir} # Convert tests, examples, source to python3 %{__python3} sa2to3.py --no-diffs -w lib test examples -# Currently the cextension doesn't work with py3 +# Currently the cextension doesn't work with python3 CFLAGS="%{optflags}" %{__python3} setup.py build popd %endif @@ -104,6 +92,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} popd %endif @@ -137,6 +126,10 @@ popd %endif # with_python3 %changelog +* Fri Apr 12 2013 Toshio Kuratomi - 0.8.0-1 +- Final release of 0.8.0 +- Fix for a unittest that assumes order in dicts + * Thu Feb 14 2013 Fedora Release Engineering - 0.8.0-0.2.b1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 9655c21..5aee153 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a76e4bbd6deec8e0951601ff3a5d1fce SQLAlchemy-0.8.0b1.tar.gz +11cd07ca81fab78d53f2922b5fb187a3 SQLAlchemy-0.8.0.tar.gz diff --git a/sqlalchemy-unittest-ordering.patch b/sqlalchemy-unittest-ordering.patch new file mode 100644 index 0000000..462fb00 --- /dev/null +++ b/sqlalchemy-unittest-ordering.patch @@ -0,0 +1,26 @@ +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):