The attached patch updates databases/py-sqlalchemy from 0.3.7 to 0.4.1 (changes[0]). Due to upstream changes in the setuptools configuration, patch-setup_py seems to be necessary to make the build target work.
The port passes its regress tests and a small site using py-turbogears (the only port which depends on py-sqlalchemy) worked find with the 0.4.1 update. Tested on -current/i386. Patch also available via HTTP: http://www.lfod.us/files/ports/py-sqlalchemy-0_4_1.diff Thanks! diffstat: 4 files changed, 93 insertions(+), 38 deletions(-) Makefile | 4 - distinfo | 10 ++-- patches/patch-setup_py | 13 ++++++ pkg/PLIST | 104 +++++++++++++++++++++++++++++++++--------------- [0] http://www.sqlalchemy.org/CHANGES -- o--------------------------{ Will Maier }--------------------------o | web:.......http://www.lfod.us/ | [EMAIL PROTECTED] | *------------------[ BSD Unix: Live Free or Die ]------------------*
diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ COMMENT= database toolkit for Python -V= 0.3.7 +V= 0.4.1 DISTNAME= SQLAlchemy-${V} -PKGNAME= py-sqlalchemy-${V}p0 +PKGNAME= py-sqlalchemy-${V} CATEGORIES= databases lang/python diff --git a/distinfo b/distinfo --- a/distinfo +++ b/distinfo @@ -1,5 +1,5 @@ MD5 (SQLAlchemy-0.3.7.tar.gz) = 8zFGmKJw -MD5 (SQLAlchemy-0.3.7.tar.gz) = 8zFGmKJw6Pxqaf6V6YzzTg== -RMD160 (SQLAlchemy-0.3.7.tar.gz) = rrJKFCZsZ+9cn0znlbpODEhH6dQ= -SHA1 (SQLAlchemy-0.3.7.tar.gz) = 9aB9vkxr+/9u9o6vmpNBnS/Q91U= -SHA256 (SQLAlchemy-0.3.7.tar.gz) = PbK0UJVBzFaLvMERDwE8Yiy2SGcNBMxoYIX+n20cHBI= -SIZE (SQLAlchemy-0.3.7.tar.gz) = 879706 +MD5 (SQLAlchemy-0.4.1.tar.gz) = vm/jGYBhQdV3+KsC+Qhwog== +RMD160 (SQLAlchemy-0.4.1.tar.gz) = oLnkuQ18u8j2ZSJncyN6/IGZzWo= +SHA1 (SQLAlchemy-0.4.1.tar.gz) = ytUYXooxARcMwW9cE+7R4PPUtHA= +SHA256 (SQLAlchemy-0.4.1.tar.gz) = 7flCWdqu3mGCRlRCxNl1coObjMNPJZOzKklQ2Wwlfs0= +SIZE (SQLAlchemy-0.4.1.tar.gz) = 1143337 diff --git a/patches/patch-setup_py b/patches/patch-setup_py new file mode 100644 --- /dev/null +++ b/patches/patch-setup_py @@ -0,0 +1,13 @@ +$OpenBSD$ +--- setup.py.orig Sun Nov 18 16:49:52 2007 ++++ setup.py Tue Nov 20 12:32:10 2007 +@@ -14,7 +14,8 @@ class build_py(_build_py): + def run(self): + init = path.join(self.build_lib, 'sqlalchemy', '__init__.py') + if path.exists(init): +- os.unlink(init) ++ #os.unlink(init) ++ pass + _build_py.run(self) + _stamp_version(init) + self.byte_compile([init]) diff --git a/pkg/PLIST b/pkg/PLIST --- a/pkg/PLIST +++ b/pkg/PLIST @@ -14,19 +14,23 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ lib/python${MODPY_VERSION}/site-packages/sqlalchemy/__init__.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ansisql.py -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ansisql.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/ lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/__init__.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/access.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/access.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/firebird.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/firebird.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/information_schema.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/information_schema.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/informix.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/informix.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/maxdb.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/maxdb.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/mssql.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/mssql.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/mxODBC.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/mxODBC.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/mysql.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/mysql.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/oracle.py @@ -35,6 +39,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/postgres.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/sqlite.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/sqlite.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/sybase.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/databases/sybase.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/engine/ lib/python${MODPY_VERSION}/site-packages/sqlalchemy/engine/__init__.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/engine/__init__.pyc @@ -59,32 +65,34 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/assignmapper.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/associationproxy.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/associationproxy.pyc -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/proxy.py -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/proxy.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/orderinglist.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/orderinglist.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/selectresults.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/selectresults.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/sessioncontext.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/sessioncontext.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/sqlsoup.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/ext/sqlsoup.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/interfaces.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/interfaces.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/logging.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/logging.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/ lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/__init__.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/legacy_session.py -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/legacy_session.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/selectresults.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/selectresults.pyc -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/threadlocal.py -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/mods/threadlocal.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/ lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/__init__.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/__init__.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/attributes.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/attributes.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/collections.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/collections.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/dependency.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/dependency.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/dynamic.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/dynamic.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/interfaces.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/interfaces.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/mapper.py @@ -93,8 +101,12 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/properties.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/query.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/query.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/scoping.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/scoping.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/session.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/session.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/shard.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/shard.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/strategies.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/strategies.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/orm/sync.py @@ -111,10 +123,19 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sqlalchemy/queue.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/schema.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/schema.pyc -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql.py -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql.pyc -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql_util.py -lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql_util.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/ +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/__init__.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/compiler.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/compiler.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/expression.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/expression.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/operators.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/operators.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/util.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/util.pyc +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/visitors.py +lib/python${MODPY_VERSION}/site-packages/sqlalchemy/sql/visitors.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/topological.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/topological.pyc lib/python${MODPY_VERSION}/site-packages/sqlalchemy/types.py @@ -122,26 +143,26 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sqlalchemy/util.py lib/python${MODPY_VERSION}/site-packages/sqlalchemy/util.pyc share/doc/py-sqlalchemy/ -share/doc/py-sqlalchemy/adv_datamapping.html share/doc/py-sqlalchemy/alphaapi.html share/doc/py-sqlalchemy/alphaimplementation.html share/doc/py-sqlalchemy/build/ share/doc/py-sqlalchemy/build/README share/doc/py-sqlalchemy/build/content/ -share/doc/py-sqlalchemy/build/content/adv_datamapping.txt -share/doc/py-sqlalchemy/build/content/datamapping.txt +share/doc/py-sqlalchemy/build/content/copyright.txt share/doc/py-sqlalchemy/build/content/dbengine.txt share/doc/py-sqlalchemy/build/content/docstrings.html share/doc/py-sqlalchemy/build/content/documentation.html share/doc/py-sqlalchemy/build/content/index.html +share/doc/py-sqlalchemy/build/content/intro.txt +share/doc/py-sqlalchemy/build/content/mappers.txt share/doc/py-sqlalchemy/build/content/metadata.txt +share/doc/py-sqlalchemy/build/content/ormtutorial.txt share/doc/py-sqlalchemy/build/content/plugins.txt share/doc/py-sqlalchemy/build/content/pooling.txt -share/doc/py-sqlalchemy/build/content/sqlconstruction.txt -share/doc/py-sqlalchemy/build/content/threadlocal.txt +share/doc/py-sqlalchemy/build/content/session.txt +share/doc/py-sqlalchemy/build/content/sqlexpression.txt share/doc/py-sqlalchemy/build/content/tutorial.txt share/doc/py-sqlalchemy/build/content/types.txt -share/doc/py-sqlalchemy/build/content/unitofwork.txt share/doc/py-sqlalchemy/build/gen_docstrings.py share/doc/py-sqlalchemy/build/genhtml.py share/doc/py-sqlalchemy/build/lib/ @@ -150,7 +171,6 @@ share/doc/py-sqlalchemy/build/lib/markdo share/doc/py-sqlalchemy/build/lib/markdown.py share/doc/py-sqlalchemy/build/lib/toc.py share/doc/py-sqlalchemy/build/read_markdown.py -share/doc/py-sqlalchemy/build/runhtml.py share/doc/py-sqlalchemy/build/templates/ share/doc/py-sqlalchemy/build/templates/autohandler share/doc/py-sqlalchemy/build/templates/base.html @@ -161,48 +181,57 @@ share/doc/py-sqlalchemy/build/templates/ share/doc/py-sqlalchemy/build/templates/pydoc.html share/doc/py-sqlalchemy/build/templates/toc.html share/doc/py-sqlalchemy/build/testdocs.py -share/doc/py-sqlalchemy/datamapping.html +share/doc/py-sqlalchemy/copyright.html share/doc/py-sqlalchemy/dbengine.html share/doc/py-sqlalchemy/docs.css share/doc/py-sqlalchemy/docstrings.html share/doc/py-sqlalchemy/documentation.html share/doc/py-sqlalchemy/docutil.css share/doc/py-sqlalchemy/index.html +share/doc/py-sqlalchemy/intro.html +share/doc/py-sqlalchemy/mappers.html share/doc/py-sqlalchemy/metadata.html +share/doc/py-sqlalchemy/ormtutorial.html share/doc/py-sqlalchemy/plugins.html share/doc/py-sqlalchemy/pooling.html share/doc/py-sqlalchemy/scripts.js -share/doc/py-sqlalchemy/sqlalchemy_ansisql.html +share/doc/py-sqlalchemy/session.html +share/doc/py-sqlalchemy/sqlalchemy_databases_access.html share/doc/py-sqlalchemy/sqlalchemy_databases_firebird.html +share/doc/py-sqlalchemy/sqlalchemy_databases_maxdb.html share/doc/py-sqlalchemy/sqlalchemy_databases_mssql.html share/doc/py-sqlalchemy/sqlalchemy_databases_mysql.html share/doc/py-sqlalchemy/sqlalchemy_databases_oracle.html share/doc/py-sqlalchemy/sqlalchemy_databases_postgres.html share/doc/py-sqlalchemy/sqlalchemy_databases_sqlite.html +share/doc/py-sqlalchemy/sqlalchemy_databases_sybase.html share/doc/py-sqlalchemy/sqlalchemy_engine.html share/doc/py-sqlalchemy/sqlalchemy_engine_default.html share/doc/py-sqlalchemy/sqlalchemy_engine_strategies.html share/doc/py-sqlalchemy/sqlalchemy_engine_threadlocal.html share/doc/py-sqlalchemy/sqlalchemy_engine_url.html share/doc/py-sqlalchemy/sqlalchemy_exceptions.html -share/doc/py-sqlalchemy/sqlalchemy_ext_proxy.html -share/doc/py-sqlalchemy/sqlalchemy_ext_selectresults.html -share/doc/py-sqlalchemy/sqlalchemy_ext_sessioncontext.html -share/doc/py-sqlalchemy/sqlalchemy_mods_threadlocal.html +share/doc/py-sqlalchemy/sqlalchemy_ext_associationproxy.html +share/doc/py-sqlalchemy/sqlalchemy_ext_orderinglist.html +share/doc/py-sqlalchemy/sqlalchemy_ext_sqlsoup.html +share/doc/py-sqlalchemy/sqlalchemy_interfaces.html share/doc/py-sqlalchemy/sqlalchemy_orm.html +share/doc/py-sqlalchemy/sqlalchemy_orm_collections.html +share/doc/py-sqlalchemy/sqlalchemy_orm_interfaces.html share/doc/py-sqlalchemy/sqlalchemy_orm_mapper.html +share/doc/py-sqlalchemy/sqlalchemy_orm_properties.html share/doc/py-sqlalchemy/sqlalchemy_orm_query.html share/doc/py-sqlalchemy/sqlalchemy_orm_session.html +share/doc/py-sqlalchemy/sqlalchemy_orm_shard.html share/doc/py-sqlalchemy/sqlalchemy_pool.html share/doc/py-sqlalchemy/sqlalchemy_schema.html -share/doc/py-sqlalchemy/sqlalchemy_sql.html +share/doc/py-sqlalchemy/sqlalchemy_sql_compiler.html +share/doc/py-sqlalchemy/sqlalchemy_sql_expression.html share/doc/py-sqlalchemy/sqlalchemy_types.html -share/doc/py-sqlalchemy/sqlconstruction.html +share/doc/py-sqlalchemy/sqlexpression.html share/doc/py-sqlalchemy/style.css share/doc/py-sqlalchemy/syntaxhighlight.css -share/doc/py-sqlalchemy/tutorial.html share/doc/py-sqlalchemy/types.html -share/doc/py-sqlalchemy/unitofwork.html share/examples/py-sqlalchemy/ share/examples/py-sqlalchemy/README share/examples/py-sqlalchemy/adjacencytree/ @@ -211,17 +240,30 @@ share/examples/py-sqlalchemy/association share/examples/py-sqlalchemy/association/ share/examples/py-sqlalchemy/association/basic_association.py share/examples/py-sqlalchemy/association/proxied_association.py -share/examples/py-sqlalchemy/backref/ -share/examples/py-sqlalchemy/backref/backref_tree.py share/examples/py-sqlalchemy/collections/ share/examples/py-sqlalchemy/collections/large_collection.py +share/examples/py-sqlalchemy/derived_attributes/ +share/examples/py-sqlalchemy/derived_attributes/attributes.py +share/examples/py-sqlalchemy/elementtree/ +share/examples/py-sqlalchemy/elementtree/adjacency_list.py +share/examples/py-sqlalchemy/elementtree/optimized_al.py +share/examples/py-sqlalchemy/elementtree/pickle.py +share/examples/py-sqlalchemy/elementtree/test.xml +share/examples/py-sqlalchemy/elementtree/test2.xml +share/examples/py-sqlalchemy/elementtree/test3.xml share/examples/py-sqlalchemy/graphs/ share/examples/py-sqlalchemy/graphs/graph1.py share/examples/py-sqlalchemy/pickle/ share/examples/py-sqlalchemy/pickle/custom_pickler.py +share/examples/py-sqlalchemy/poly_assoc/ +share/examples/py-sqlalchemy/poly_assoc/poly_assoc.py +share/examples/py-sqlalchemy/poly_assoc/poly_assoc_fk.py +share/examples/py-sqlalchemy/poly_assoc/poly_assoc_generic.py share/examples/py-sqlalchemy/polymorph/ share/examples/py-sqlalchemy/polymorph/concrete.py share/examples/py-sqlalchemy/polymorph/polymorph.py share/examples/py-sqlalchemy/polymorph/single.py +share/examples/py-sqlalchemy/sharding/ +share/examples/py-sqlalchemy/sharding/attribute_shard.py share/examples/py-sqlalchemy/vertical/ share/examples/py-sqlalchemy/vertical/vertical.py