Hi,
Please unblock sqlalchemy 0.4.7p1-1. It's a new upstream release but only
3 lines of code[1] are changed (4 including version change).
Please note that 0.4.* releases are just a bug fix releases, development
version of SQLAlchemy (0.5.x series) is already in experimental.
I'm attaching diffstat and
`debdiff sqlalchemy_0.4.7{,p1}-1.dsc | filterdiff -x '*/doc/*' -x '*/test/*'`
output.
BTW: I'm using this version since 2008-08-01, I uploaded it to unstable
recently due to 0.4.7-1 transition.
[1] i.e. without docs/tests
--
-=[ Piotr Ożarowski ]=-
-=[ http://www.ozarowski.pl ]=-
diff -Nru sqlalchemy-0.4.7/CHANGES sqlalchemy-0.4.7p1/CHANGES
--- sqlalchemy-0.4.7/CHANGES 2008-07-26 18:43:59.000000000 +0200
+++ sqlalchemy-0.4.7p1/CHANGES 2008-07-31 17:08:36.000000000 +0200
@@ -1,6 +1,21 @@
=======
CHANGES
=======
+0.4.7p1
+=====
+- orm
+ - Added "add()" and "add_all()" to scoped_session
+ methods. Workaround for 0.4.7:
+
+ from sqlalchemy.orm.scoping import ScopedSession,\
+ instrument
+ setattr(
+ ScopedSession, "add", instrument("add"))
+ setattr(
+ ScopedSession, "add_all", instrument("add_all"))
+
+ - Fixed non-2.3 compatible usage of set() and generator
+ expression within relation().
0.4.7
=====
diff -Nru sqlalchemy-0.4.7/debian/changelog sqlalchemy-0.4.7p1/debian/changelog
--- sqlalchemy-0.4.7/debian/changelog 2008-08-10 21:57:39.000000000 +0200
+++ sqlalchemy-0.4.7p1/debian/changelog 2008-08-10 21:57:39.000000000 +0200
@@ -1,3 +1,9 @@
+sqlalchemy (0.4.7p1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Piotr Ożarowski <piotr@debian.org> Fri, 01 Aug 2008 19:43:14 +0200
+
sqlalchemy (0.4.7-1) unstable; urgency=low
* New upstream release
diff -Nru sqlalchemy-0.4.7/doc/copyright.html sqlalchemy-0.4.7p1/doc/copyright.html
diff -Nru sqlalchemy-0.4.7/doc/dbengine.html sqlalchemy-0.4.7p1/doc/dbengine.html
diff -Nru sqlalchemy-0.4.7/doc/docstrings.html sqlalchemy-0.4.7p1/doc/docstrings.html
diff -Nru sqlalchemy-0.4.7/doc/documentation.html sqlalchemy-0.4.7p1/doc/documentation.html
diff -Nru sqlalchemy-0.4.7/doc/index.html sqlalchemy-0.4.7p1/doc/index.html
diff -Nru sqlalchemy-0.4.7/doc/intro.html sqlalchemy-0.4.7p1/doc/intro.html
diff -Nru sqlalchemy-0.4.7/doc/mappers.html sqlalchemy-0.4.7p1/doc/mappers.html
diff -Nru sqlalchemy-0.4.7/doc/metadata.html sqlalchemy-0.4.7p1/doc/metadata.html
diff -Nru sqlalchemy-0.4.7/doc/ormtutorial.html sqlalchemy-0.4.7p1/doc/ormtutorial.html
diff -Nru sqlalchemy-0.4.7/doc/plugins.html sqlalchemy-0.4.7p1/doc/plugins.html
diff -Nru sqlalchemy-0.4.7/doc/pooling.html sqlalchemy-0.4.7p1/doc/pooling.html
diff -Nru sqlalchemy-0.4.7/doc/session.html sqlalchemy-0.4.7p1/doc/session.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_access.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_access.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_firebird.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_firebird.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_maxdb.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_maxdb.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_mssql.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_mssql.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_mysql.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_mysql.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_oracle.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_oracle.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_postgres.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_postgres.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_sqlite.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_sqlite.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_databases_sybase.html sqlalchemy-0.4.7p1/doc/sqlalchemy_databases_sybase.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_engine_default.html sqlalchemy-0.4.7p1/doc/sqlalchemy_engine_default.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_engine.html sqlalchemy-0.4.7p1/doc/sqlalchemy_engine.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_engine_strategies.html sqlalchemy-0.4.7p1/doc/sqlalchemy_engine_strategies.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_engine_threadlocal.html sqlalchemy-0.4.7p1/doc/sqlalchemy_engine_threadlocal.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_engine_url.html sqlalchemy-0.4.7p1/doc/sqlalchemy_engine_url.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_exceptions.html sqlalchemy-0.4.7p1/doc/sqlalchemy_exceptions.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_ext_associationproxy.html sqlalchemy-0.4.7p1/doc/sqlalchemy_ext_associationproxy.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_ext_declarative.html sqlalchemy-0.4.7p1/doc/sqlalchemy_ext_declarative.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_ext_orderinglist.html sqlalchemy-0.4.7p1/doc/sqlalchemy_ext_orderinglist.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_ext_sqlsoup.html sqlalchemy-0.4.7p1/doc/sqlalchemy_ext_sqlsoup.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_interfaces.html sqlalchemy-0.4.7p1/doc/sqlalchemy_interfaces.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_collections.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_collections.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_interfaces.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_interfaces.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_mapper.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_mapper.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_properties.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_properties.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_query.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_query.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_session.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_session.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_orm_shard.html sqlalchemy-0.4.7p1/doc/sqlalchemy_orm_shard.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_pool.html sqlalchemy-0.4.7p1/doc/sqlalchemy_pool.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_schema.html sqlalchemy-0.4.7p1/doc/sqlalchemy_schema.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_sql_compiler.html sqlalchemy-0.4.7p1/doc/sqlalchemy_sql_compiler.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_sql_expression.html sqlalchemy-0.4.7p1/doc/sqlalchemy_sql_expression.html
diff -Nru sqlalchemy-0.4.7/doc/sqlalchemy_types.html sqlalchemy-0.4.7p1/doc/sqlalchemy_types.html
diff -Nru sqlalchemy-0.4.7/doc/sqlexpression.html sqlalchemy-0.4.7p1/doc/sqlexpression.html
diff -Nru sqlalchemy-0.4.7/doc/types.html sqlalchemy-0.4.7p1/doc/types.html
diff -Nru sqlalchemy-0.4.7/lib/sqlalchemy/__init__.py sqlalchemy-0.4.7p1/lib/sqlalchemy/__init__.py
--- sqlalchemy-0.4.7/lib/sqlalchemy/__init__.py 2008-07-26 18:46:56.000000000 +0200
+++ sqlalchemy-0.4.7p1/lib/sqlalchemy/__init__.py 2008-07-31 17:16:17.000000000 +0200
@@ -31,4 +31,4 @@
__all__ = [ name for name, obj in locals().items()
if not (name.startswith('_') or inspect.ismodule(obj)) ]
-__version__ = '0.4.7'
+__version__ = '0.4.7p1'
diff -Nru sqlalchemy-0.4.7/lib/sqlalchemy/orm/properties.py sqlalchemy-0.4.7p1/lib/sqlalchemy/orm/properties.py
--- sqlalchemy-0.4.7/lib/sqlalchemy/orm/properties.py 2008-07-26 18:43:54.000000000 +0200
+++ sqlalchemy-0.4.7p1/lib/sqlalchemy/orm/properties.py 2008-07-31 17:08:32.000000000 +0200
@@ -551,7 +551,7 @@
if self._legacy_foreignkey and not self._refers_to_parent_table():
self.foreign_keys = self._legacy_foreignkey
- arg_foreign_keys = set(expression._literal_as_column(x) for x in util.to_set(self.foreign_keys))
+ arg_foreign_keys = util.Set([expression._literal_as_column(x) for x in util.to_set(self.foreign_keys)])
if self._arg_local_remote_pairs:
if not arg_foreign_keys:
@@ -613,7 +613,7 @@
else:
eq_pairs = self._arg_local_remote_pairs
elif self.remote_side:
- remote_side = set(expression._literal_as_column(x) for x in util.to_set(self.remote_side))
+ remote_side = util.Set([expression._literal_as_column(x) for x in util.to_set(self.remote_side)])
if self.direction is MANYTOONE:
eq_pairs = criterion_as_pairs(self.primaryjoin, consider_as_referenced_keys=remote_side, any_operator=True)
diff -Nru sqlalchemy-0.4.7/lib/sqlalchemy/orm/scoping.py sqlalchemy-0.4.7p1/lib/sqlalchemy/orm/scoping.py
--- sqlalchemy-0.4.7/lib/sqlalchemy/orm/scoping.py 2008-07-26 18:43:54.000000000 +0200
+++ sqlalchemy-0.4.7p1/lib/sqlalchemy/orm/scoping.py 2008-07-31 17:08:32.000000000 +0200
@@ -97,7 +97,7 @@
def do(self, *args, **kwargs):
return getattr(self.registry(), name)(*args, **kwargs)
return do
-for meth in ('get', 'load', 'close', 'save', 'commit', 'update', 'save_or_update', 'flush', 'query', 'delete', 'merge', 'clear', 'refresh', 'expire', 'expunge', 'rollback', 'begin', 'begin_nested', 'connection', 'execute', 'scalar', 'get_bind', 'is_modified', '__contains__', '__iter__'):
+for meth in ('add', 'add_all', 'get', 'load', 'close', 'save', 'commit', 'update', 'save_or_update', 'flush', 'query', 'delete', 'merge', 'clear', 'refresh', 'expire', 'expunge', 'rollback', 'begin', 'begin_nested', 'connection', 'execute', 'scalar', 'get_bind', 'is_modified', '__contains__', '__iter__'):
setattr(ScopedSession, meth, instrument(meth))
def makeprop(name):
diff -Nru sqlalchemy-0.4.7/lib/SQLAlchemy.egg-info/PKG-INFO sqlalchemy-0.4.7p1/lib/SQLAlchemy.egg-info/PKG-INFO
--- sqlalchemy-0.4.7/lib/SQLAlchemy.egg-info/PKG-INFO 2008-07-26 18:46:55.000000000 +0200
+++ sqlalchemy-0.4.7p1/lib/SQLAlchemy.egg-info/PKG-INFO 2008-07-31 17:16:16.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: SQLAlchemy
-Version: 0.4.7
+Version: 0.4.7p1
Summary: Database Abstraction Library
Home-page: http://www.sqlalchemy.org
Author: Mike Bayer
diff -Nru sqlalchemy-0.4.7/lib/SQLAlchemy.egg-info/SOURCES.txt sqlalchemy-0.4.7p1/lib/SQLAlchemy.egg-info/SOURCES.txt
--- sqlalchemy-0.4.7/lib/SQLAlchemy.egg-info/SOURCES.txt 2008-07-26 18:46:55.000000000 +0200
+++ sqlalchemy-0.4.7p1/lib/SQLAlchemy.egg-info/SOURCES.txt 2008-07-31 17:16:16.000000000 +0200
@@ -296,6 +296,10 @@
test/profiling/compiler.py
test/profiling/pool.py
test/profiling/zoomark.py
+test/py23/__init__.py
+test/py23/alltests.py
+test/py23/test_orm.py
+test/py23/test_sql.py
test/sql/__init__.py
test/sql/alltests.py
test/sql/case_statement.py
diff -Nru sqlalchemy-0.4.7/PKG-INFO sqlalchemy-0.4.7p1/PKG-INFO
--- sqlalchemy-0.4.7/PKG-INFO 2008-07-26 18:46:56.000000000 +0200
+++ sqlalchemy-0.4.7p1/PKG-INFO 2008-07-31 17:16:17.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: SQLAlchemy
-Version: 0.4.7
+Version: 0.4.7p1
Summary: Database Abstraction Library
Home-page: http://www.sqlalchemy.org
Author: Mike Bayer
diff -Nru sqlalchemy-0.4.7/test/orm/session.py sqlalchemy-0.4.7p1/test/orm/session.py
diff -Nru sqlalchemy-0.4.7/test/py23/alltests.py sqlalchemy-0.4.7p1/test/py23/alltests.py
diff -Nru sqlalchemy-0.4.7/test/py23/test_orm.py sqlalchemy-0.4.7p1/test/py23/test_orm.py
diff -Nru sqlalchemy-0.4.7/test/py23/test_sql.py sqlalchemy-0.4.7p1/test/py23/test_sql.py
diff -Nru sqlalchemy-0.4.7/VERSION sqlalchemy-0.4.7p1/VERSION
--- sqlalchemy-0.4.7/VERSION 2008-07-26 18:43:59.000000000 +0200
+++ sqlalchemy-0.4.7p1/VERSION 2008-07-31 17:08:36.000000000 +0200
@@ -1 +1 @@
-0.4.7
+0.4.7p1
CHANGES | 15 +++++++ PKG-INFO | 2 - VERSION | 2 - debian/changelog | 6 +++ doc/copyright.html | 2 - doc/dbengine.html | 2 - doc/docstrings.html | 2 - doc/documentation.html | 2 - doc/index.html | 2 - doc/intro.html | 2 - doc/mappers.html | 2 - doc/metadata.html | 2 - doc/ormtutorial.html | 2 - doc/plugins.html | 2 - doc/pooling.html | 2 - doc/session.html | 2 - doc/sqlalchemy_databases_access.html | 2 - doc/sqlalchemy_databases_firebird.html | 2 - doc/sqlalchemy_databases_maxdb.html | 2 - doc/sqlalchemy_databases_mssql.html | 2 - doc/sqlalchemy_databases_mysql.html | 2 - doc/sqlalchemy_databases_oracle.html | 2 - doc/sqlalchemy_databases_postgres.html | 2 - doc/sqlalchemy_databases_sqlite.html | 2 - doc/sqlalchemy_databases_sybase.html | 2 - doc/sqlalchemy_engine.html | 2 - doc/sqlalchemy_engine_default.html | 2 - doc/sqlalchemy_engine_strategies.html | 2 - doc/sqlalchemy_engine_threadlocal.html | 2 - doc/sqlalchemy_engine_url.html | 2 - doc/sqlalchemy_exceptions.html | 2 - doc/sqlalchemy_ext_associationproxy.html | 2 - doc/sqlalchemy_ext_declarative.html | 2 - doc/sqlalchemy_ext_orderinglist.html | 2 - doc/sqlalchemy_ext_sqlsoup.html | 2 - doc/sqlalchemy_interfaces.html | 2 - doc/sqlalchemy_orm.html | 2 - doc/sqlalchemy_orm_collections.html | 2 - doc/sqlalchemy_orm_interfaces.html | 2 - doc/sqlalchemy_orm_mapper.html | 2 - doc/sqlalchemy_orm_properties.html | 2 - doc/sqlalchemy_orm_query.html | 2 - doc/sqlalchemy_orm_session.html | 2 - doc/sqlalchemy_orm_shard.html | 2 - doc/sqlalchemy_pool.html | 2 - doc/sqlalchemy_schema.html | 2 - doc/sqlalchemy_sql_compiler.html | 2 - doc/sqlalchemy_sql_expression.html | 2 - doc/sqlalchemy_types.html | 2 - doc/sqlexpression.html | 2 - doc/types.html | 2 - lib/SQLAlchemy.egg-info/PKG-INFO | 2 - lib/SQLAlchemy.egg-info/SOURCES.txt | 4 ++ lib/sqlalchemy/__init__.py | 2 - lib/sqlalchemy/orm/properties.py | 4 +- lib/sqlalchemy/orm/scoping.py | 2 - test/orm/session.py | 17 ++++++++ test/py23/alltests.py | 19 +++++++++ test/py23/test_orm.py | 59 +++++++++++++++++++++++++++++++ test/py23/test_sql.py | 36 ++++++++++++++++++ 60 files changed, 209 insertions(+), 55 deletions(-)
Attachment:
pgpXkBC8jT2lK.pgp
Description: PGP signature