Updated to latest stable release, 0.9.4. This was required, because some

newer py-sqlalchemy-* packages won't work with our archive version. Changes
are too numerous to list here. Check:
http://docs.sqlalchemy.org/en/latest/changelog/

4 files changed, 89 insertions, 31 deletions

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 8597bd22cba..d331a8be165 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/01/20 22:27:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2014/06/14 16:20:45 rodent Exp $
 
-DISTNAME=	SQLAlchemy-0.8.2
+DISTNAME=	SQLAlchemy-0.9.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=	1
-EGG_NAME=	${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://pypi.python.org/packages/source/S/SQLAlchemy/
 
diff --git a/databases/py-sqlalchemy/PLIST b/databases/py-sqlalchemy/PLIST
index 02ed5b1e7fc..0afa402984b 100644
--- a/databases/py-sqlalchemy/PLIST
+++ b/databases/py-sqlalchemy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/01/20 22:27:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/06/14 16:20:45 rodent Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -21,9 +21,9 @@ ${PYSITELIB}/sqlalchemy/connectors/pyodbc.pyo
 ${PYSITELIB}/sqlalchemy/connectors/zxJDBC.py
 ${PYSITELIB}/sqlalchemy/connectors/zxJDBC.pyc
 ${PYSITELIB}/sqlalchemy/connectors/zxJDBC.pyo
-${PLIST.py2x}${PYSITELIB}/sqlalchemy/cprocessors.so
-${PLIST.py2x}${PYSITELIB}/sqlalchemy/cresultproxy.so
-${PLIST.py2x}${PYSITELIB}/sqlalchemy/cutils.so
+${PYSITELIB}/sqlalchemy/cprocessors.so
+${PYSITELIB}/sqlalchemy/cresultproxy.so
+${PYSITELIB}/sqlalchemy/cutils.so
 ${PYSITELIB}/sqlalchemy/databases/__init__.py
 ${PYSITELIB}/sqlalchemy/databases/__init__.pyc
 ${PYSITELIB}/sqlalchemy/databases/__init__.pyo
@@ -51,15 +51,6 @@ ${PYSITELIB}/sqlalchemy/dialects/firebird/fdb.pyo
 ${PYSITELIB}/sqlalchemy/dialects/firebird/kinterbasdb.py
 ${PYSITELIB}/sqlalchemy/dialects/firebird/kinterbasdb.pyc
 ${PYSITELIB}/sqlalchemy/dialects/firebird/kinterbasdb.pyo
-${PYSITELIB}/sqlalchemy/dialects/informix/__init__.py
-${PYSITELIB}/sqlalchemy/dialects/informix/__init__.pyc
-${PYSITELIB}/sqlalchemy/dialects/informix/__init__.pyo
-${PYSITELIB}/sqlalchemy/dialects/informix/base.py
-${PYSITELIB}/sqlalchemy/dialects/informix/base.pyc
-${PYSITELIB}/sqlalchemy/dialects/informix/base.pyo
-${PYSITELIB}/sqlalchemy/dialects/informix/informixdb.py
-${PYSITELIB}/sqlalchemy/dialects/informix/informixdb.pyc
-${PYSITELIB}/sqlalchemy/dialects/informix/informixdb.pyo
 ${PYSITELIB}/sqlalchemy/dialects/mssql/__init__.py
 ${PYSITELIB}/sqlalchemy/dialects/mssql/__init__.pyc
 ${PYSITELIB}/sqlalchemy/dialects/mssql/__init__.pyo
@@ -141,6 +132,9 @@ ${PYSITELIB}/sqlalchemy/dialects/postgresql/constraints.pyo
 ${PYSITELIB}/sqlalchemy/dialects/postgresql/hstore.py
 ${PYSITELIB}/sqlalchemy/dialects/postgresql/hstore.pyc
 ${PYSITELIB}/sqlalchemy/dialects/postgresql/hstore.pyo
+${PYSITELIB}/sqlalchemy/dialects/postgresql/json.py
+${PYSITELIB}/sqlalchemy/dialects/postgresql/json.pyc
+${PYSITELIB}/sqlalchemy/dialects/postgresql/json.pyo
 ${PYSITELIB}/sqlalchemy/dialects/postgresql/pg8000.py
 ${PYSITELIB}/sqlalchemy/dialects/postgresql/pg8000.pyc
 ${PYSITELIB}/sqlalchemy/dialects/postgresql/pg8000.pyo
@@ -186,9 +180,6 @@ ${PYSITELIB}/sqlalchemy/engine/__init__.pyo
 ${PYSITELIB}/sqlalchemy/engine/base.py
 ${PYSITELIB}/sqlalchemy/engine/base.pyc
 ${PYSITELIB}/sqlalchemy/engine/base.pyo
-${PYSITELIB}/sqlalchemy/engine/ddl.py
-${PYSITELIB}/sqlalchemy/engine/ddl.pyc
-${PYSITELIB}/sqlalchemy/engine/ddl.pyo
 ${PYSITELIB}/sqlalchemy/engine/default.py
 ${PYSITELIB}/sqlalchemy/engine/default.pyc
 ${PYSITELIB}/sqlalchemy/engine/default.pyo
@@ -213,9 +204,24 @@ ${PYSITELIB}/sqlalchemy/engine/url.pyo
 ${PYSITELIB}/sqlalchemy/engine/util.py
 ${PYSITELIB}/sqlalchemy/engine/util.pyc
 ${PYSITELIB}/sqlalchemy/engine/util.pyo
-${PYSITELIB}/sqlalchemy/event.py
-${PYSITELIB}/sqlalchemy/event.pyc
-${PYSITELIB}/sqlalchemy/event.pyo
+${PYSITELIB}/sqlalchemy/event/__init__.py
+${PYSITELIB}/sqlalchemy/event/__init__.pyc
+${PYSITELIB}/sqlalchemy/event/__init__.pyo
+${PYSITELIB}/sqlalchemy/event/api.py
+${PYSITELIB}/sqlalchemy/event/api.pyc
+${PYSITELIB}/sqlalchemy/event/api.pyo
+${PYSITELIB}/sqlalchemy/event/attr.py
+${PYSITELIB}/sqlalchemy/event/attr.pyc
+${PYSITELIB}/sqlalchemy/event/attr.pyo
+${PYSITELIB}/sqlalchemy/event/base.py
+${PYSITELIB}/sqlalchemy/event/base.pyc
+${PYSITELIB}/sqlalchemy/event/base.pyo
+${PYSITELIB}/sqlalchemy/event/legacy.py
+${PYSITELIB}/sqlalchemy/event/legacy.pyc
+${PYSITELIB}/sqlalchemy/event/legacy.pyo
+${PYSITELIB}/sqlalchemy/event/registry.py
+${PYSITELIB}/sqlalchemy/event/registry.pyc
+${PYSITELIB}/sqlalchemy/event/registry.pyo
 ${PYSITELIB}/sqlalchemy/events.py
 ${PYSITELIB}/sqlalchemy/events.pyc
 ${PYSITELIB}/sqlalchemy/events.pyo
@@ -228,6 +234,9 @@ ${PYSITELIB}/sqlalchemy/ext/__init__.pyo
 ${PYSITELIB}/sqlalchemy/ext/associationproxy.py
 ${PYSITELIB}/sqlalchemy/ext/associationproxy.pyc
 ${PYSITELIB}/sqlalchemy/ext/associationproxy.pyo
+${PYSITELIB}/sqlalchemy/ext/automap.py
+${PYSITELIB}/sqlalchemy/ext/automap.pyc
+${PYSITELIB}/sqlalchemy/ext/automap.pyo
 ${PYSITELIB}/sqlalchemy/ext/compiler.py
 ${PYSITELIB}/sqlalchemy/ext/compiler.pyc
 ${PYSITELIB}/sqlalchemy/ext/compiler.pyo
@@ -276,6 +285,9 @@ ${PYSITELIB}/sqlalchemy/orm/__init__.pyo
 ${PYSITELIB}/sqlalchemy/orm/attributes.py
 ${PYSITELIB}/sqlalchemy/orm/attributes.pyc
 ${PYSITELIB}/sqlalchemy/orm/attributes.pyo
+${PYSITELIB}/sqlalchemy/orm/base.py
+${PYSITELIB}/sqlalchemy/orm/base.pyc
+${PYSITELIB}/sqlalchemy/orm/base.pyo
 ${PYSITELIB}/sqlalchemy/orm/collections.py
 ${PYSITELIB}/sqlalchemy/orm/collections.pyc
 ${PYSITELIB}/sqlalchemy/orm/collections.pyo
@@ -315,6 +327,9 @@ ${PYSITELIB}/sqlalchemy/orm/loading.pyo
 ${PYSITELIB}/sqlalchemy/orm/mapper.py
 ${PYSITELIB}/sqlalchemy/orm/mapper.pyc
 ${PYSITELIB}/sqlalchemy/orm/mapper.pyo
+${PYSITELIB}/sqlalchemy/orm/path_registry.py
+${PYSITELIB}/sqlalchemy/orm/path_registry.pyc
+${PYSITELIB}/sqlalchemy/orm/path_registry.pyo
 ${PYSITELIB}/sqlalchemy/orm/persistence.py
 ${PYSITELIB}/sqlalchemy/orm/persistence.pyc
 ${PYSITELIB}/sqlalchemy/orm/persistence.pyo
@@ -339,6 +354,9 @@ ${PYSITELIB}/sqlalchemy/orm/state.pyo
 ${PYSITELIB}/sqlalchemy/orm/strategies.py
 ${PYSITELIB}/sqlalchemy/orm/strategies.pyc
 ${PYSITELIB}/sqlalchemy/orm/strategies.pyo
+${PYSITELIB}/sqlalchemy/orm/strategy_options.py
+${PYSITELIB}/sqlalchemy/orm/strategy_options.pyc
+${PYSITELIB}/sqlalchemy/orm/strategy_options.pyo
 ${PYSITELIB}/sqlalchemy/orm/sync.py
 ${PYSITELIB}/sqlalchemy/orm/sync.pyc
 ${PYSITELIB}/sqlalchemy/orm/sync.pyo
@@ -360,18 +378,51 @@ ${PYSITELIB}/sqlalchemy/schema.pyo
 ${PYSITELIB}/sqlalchemy/sql/__init__.py
 ${PYSITELIB}/sqlalchemy/sql/__init__.pyc
 ${PYSITELIB}/sqlalchemy/sql/__init__.pyo
+${PYSITELIB}/sqlalchemy/sql/annotation.py
+${PYSITELIB}/sqlalchemy/sql/annotation.pyc
+${PYSITELIB}/sqlalchemy/sql/annotation.pyo
+${PYSITELIB}/sqlalchemy/sql/base.py
+${PYSITELIB}/sqlalchemy/sql/base.pyc
+${PYSITELIB}/sqlalchemy/sql/base.pyo
 ${PYSITELIB}/sqlalchemy/sql/compiler.py
 ${PYSITELIB}/sqlalchemy/sql/compiler.pyc
 ${PYSITELIB}/sqlalchemy/sql/compiler.pyo
+${PYSITELIB}/sqlalchemy/sql/ddl.py
+${PYSITELIB}/sqlalchemy/sql/ddl.pyc
+${PYSITELIB}/sqlalchemy/sql/ddl.pyo
+${PYSITELIB}/sqlalchemy/sql/default_comparator.py
+${PYSITELIB}/sqlalchemy/sql/default_comparator.pyc
+${PYSITELIB}/sqlalchemy/sql/default_comparator.pyo
+${PYSITELIB}/sqlalchemy/sql/dml.py
+${PYSITELIB}/sqlalchemy/sql/dml.pyc
+${PYSITELIB}/sqlalchemy/sql/dml.pyo
+${PYSITELIB}/sqlalchemy/sql/elements.py
+${PYSITELIB}/sqlalchemy/sql/elements.pyc
+${PYSITELIB}/sqlalchemy/sql/elements.pyo
 ${PYSITELIB}/sqlalchemy/sql/expression.py
 ${PYSITELIB}/sqlalchemy/sql/expression.pyc
 ${PYSITELIB}/sqlalchemy/sql/expression.pyo
 ${PYSITELIB}/sqlalchemy/sql/functions.py
 ${PYSITELIB}/sqlalchemy/sql/functions.pyc
 ${PYSITELIB}/sqlalchemy/sql/functions.pyo
+${PYSITELIB}/sqlalchemy/sql/naming.py
+${PYSITELIB}/sqlalchemy/sql/naming.pyc
+${PYSITELIB}/sqlalchemy/sql/naming.pyo
 ${PYSITELIB}/sqlalchemy/sql/operators.py
 ${PYSITELIB}/sqlalchemy/sql/operators.pyc
 ${PYSITELIB}/sqlalchemy/sql/operators.pyo
+${PYSITELIB}/sqlalchemy/sql/schema.py
+${PYSITELIB}/sqlalchemy/sql/schema.pyc
+${PYSITELIB}/sqlalchemy/sql/schema.pyo
+${PYSITELIB}/sqlalchemy/sql/selectable.py
+${PYSITELIB}/sqlalchemy/sql/selectable.pyc
+${PYSITELIB}/sqlalchemy/sql/selectable.pyo
+${PYSITELIB}/sqlalchemy/sql/sqltypes.py
+${PYSITELIB}/sqlalchemy/sql/sqltypes.pyc
+${PYSITELIB}/sqlalchemy/sql/sqltypes.pyo
+${PYSITELIB}/sqlalchemy/sql/type_api.py
+${PYSITELIB}/sqlalchemy/sql/type_api.pyc
+${PYSITELIB}/sqlalchemy/sql/type_api.pyo
 ${PYSITELIB}/sqlalchemy/sql/util.py
 ${PYSITELIB}/sqlalchemy/sql/util.pyc
 ${PYSITELIB}/sqlalchemy/sql/util.pyo
@@ -414,6 +465,12 @@ ${PYSITELIB}/sqlalchemy/testing/plugin/__init__.pyo
 ${PYSITELIB}/sqlalchemy/testing/plugin/noseplugin.py
 ${PYSITELIB}/sqlalchemy/testing/plugin/noseplugin.pyc
 ${PYSITELIB}/sqlalchemy/testing/plugin/noseplugin.pyo
+${PYSITELIB}/sqlalchemy/testing/plugin/plugin_base.py
+${PYSITELIB}/sqlalchemy/testing/plugin/plugin_base.pyc
+${PYSITELIB}/sqlalchemy/testing/plugin/plugin_base.pyo
+${PYSITELIB}/sqlalchemy/testing/plugin/pytestplugin.py
+${PYSITELIB}/sqlalchemy/testing/plugin/pytestplugin.pyc
+${PYSITELIB}/sqlalchemy/testing/plugin/pytestplugin.pyo
 ${PYSITELIB}/sqlalchemy/testing/profiling.py
 ${PYSITELIB}/sqlalchemy/testing/profiling.pyc
 ${PYSITELIB}/sqlalchemy/testing/profiling.pyo
@@ -441,6 +498,9 @@ ${PYSITELIB}/sqlalchemy/testing/suite/test_reflection.pyo
 ${PYSITELIB}/sqlalchemy/testing/suite/test_results.py
 ${PYSITELIB}/sqlalchemy/testing/suite/test_results.pyc
 ${PYSITELIB}/sqlalchemy/testing/suite/test_results.pyo
+${PYSITELIB}/sqlalchemy/testing/suite/test_select.py
+${PYSITELIB}/sqlalchemy/testing/suite/test_select.pyc
+${PYSITELIB}/sqlalchemy/testing/suite/test_select.pyo
 ${PYSITELIB}/sqlalchemy/testing/suite/test_sequence.py
 ${PYSITELIB}/sqlalchemy/testing/suite/test_sequence.pyc
 ${PYSITELIB}/sqlalchemy/testing/suite/test_sequence.pyo
diff --git a/databases/py-sqlalchemy/distinfo b/databases/py-sqlalchemy/distinfo
index 11956bbf813..99ff9e04735 100644
--- a/databases/py-sqlalchemy/distinfo
+++ b/databases/py-sqlalchemy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2013/10/14 17:57:30 tonnerre Exp $
+$NetBSD: distinfo,v 1.7 2014/06/14 16:20:45 rodent Exp $
 
-SHA1 (SQLAlchemy-0.8.2.tar.gz) = 9844a3d7a9344dfe8243da4b125a273ff39fbce7
-RMD160 (SQLAlchemy-0.8.2.tar.gz) = c49ab9ccaf93885b9f0ff20d8a34a71218adc726
-Size (SQLAlchemy-0.8.2.tar.gz) = 3816467 bytes
+SHA1 (SQLAlchemy-0.9.4.tar.gz) = a6865be94ddfdb618af156b56174ec6bff942653
+RMD160 (SQLAlchemy-0.9.4.tar.gz) = d2ba2699f56b01a694e3fb449fc4f9cb8d5d0371
+Size (SQLAlchemy-0.9.4.tar.gz) = 4492988 bytes
diff --git a/databases/py-sqlalchemy/options.mk b/databases/py-sqlalchemy/options.mk
index b60caba6b4a..dc1072967e4 100644
--- a/databases/py-sqlalchemy/options.mk
+++ b/databases/py-sqlalchemy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/05/09 07:36:57 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2014/06/14 16:20:45 rodent Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-sqlalchemy
 PKG_SUPPORTED_OPTIONS=	mysql sqlite pgsql mssql
@@ -7,12 +7,12 @@ PKG_SUPPORTED_OPTIONS=	mysql sqlite pgsql mssql
 
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=	${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 34 34 # py-mysqldb
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-mysqldb
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 34 34 # py-sqlite2
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-sqlite2
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
@@ -21,5 +21,5 @@ DEPENDS+=	${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
 
 .if !empty(PKG_OPTIONS:Mmssql)
 DEPENDS+=	${PYPKGPREFIX}-mssql-[0-9]*:../../databases/py-mssql
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 34 34 # py-mssql
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-mssql
 .endif