Index: databases/Makefile =================================================================== --- databases/Makefile +++ databases/Makefile @@ -776,10 +776,12 @@ SUBDIR += py-riak SUBDIR += py-rrdtool_lgpl SUBDIR += py-south - SUBDIR += py-sqlalchemy - SUBDIR += py-sqlalchemy-devel SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy06 + SUBDIR += py-sqlalchemy07 + SUBDIR += py-sqlalchemy08 + SUBDIR += py-sqlalchemy09 + SUBDIR += py-sqlalchemy10 SUBDIR += py-sqlite3 SUBDIR += py-sqlite3dbm SUBDIR += py-sqlobject Index: databases/py-alembic/Makefile =================================================================== --- databases/py-alembic/Makefile +++ databases/py-alembic/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.3:databases/py-sqlalchemy \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.3:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako USES= python Index: databases/py-flask-sqlalchemy/Makefile =================================================================== --- databases/py-flask-sqlalchemy/Makefile +++ databases/py-flask-sqlalchemy/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy07 USES= python USE_PYTHON= distutils autoplist Index: databases/py-geoalchemy/Makefile =================================================================== --- databases/py-geoalchemy/Makefile +++ databases/py-geoalchemy/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:databases/py-sqlalchemy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:databases/py-sqlalchemy07 USE_PYTHON= autoplist distutils USES= python:2 Index: databases/py-geoalchemy2/Makefile =================================================================== --- databases/py-geoalchemy2/Makefile +++ databases/py-geoalchemy2/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy08>=0.8:databases/py-sqlalchemy-devel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy08>=0.8:databases/py-sqlalchemy08 NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: databases/py-sqlalchemy-devel/Makefile =================================================================== --- databases/py-sqlalchemy-devel/Makefile +++ databases/py-sqlalchemy-devel/Makefile @@ -1,99 +0,0 @@ -# Created by: Dryice Dong Liu -# $FreeBSD$ - -PORTNAME= sqlalchemy -PORTVERSION= 0.8.2 -PORTREVISION= 1 -CATEGORIES= databases python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 08 -DISTNAME= SQLAlchemy-${DISTVERSION} - -MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper - -LICENSE= MIT - -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose - -USES= python -USE_PYTHON= distutils autoplist - -PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} -PY2TO3_ARGS= --no-diffs --nobackups --verbose --write - -OPTIONS_DEFINE= DOCS EXAMPLES TESTS -OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE -OPTIONS_DEFAULT= SQLITE - -SYBASE_DESC= Sybase backend -TESTS_DESC= Include nose for unit tests - -MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:databases/py-mssql -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>0:databases/py-sybase -TESTS_BUILD_DEPENDS:= ${TEST_DEPENDS} - -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} -PORTDOCS= * -PORTEXAMPLES= * - -.include -.include - -.if ${PORT_OPTIONS:MDOCS} -AL_PORTDOCS= *.html *.js -AL_PORTDOCS_SUBDIR= core dialects orm -.endif - -.if ${PORT_OPTIONS:MMYSQL} -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -#.else -# At the moment databases/py-pymysql does not build with Python3 -# See https://github.com/petehunt/PyMySQL#python-3-0-support -#RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql -.endif -.endif - -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock -.endif - -.if ${PYTHON_REL} >= 3000 -pre-build: - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib -.endif - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.if ${PYTHON_REL} >= 3000 - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc -.endif - -.for i in ${AL_PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.for i in ${AL_PORTDOCS_SUBDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} - (cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}) -.endfor - - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} >= 3000 - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - -regression-test: build -.if ${PYTHON_REL} >= 3000 - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test -.endif - @cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py - -.include Index: databases/py-sqlalchemy-devel/distinfo =================================================================== --- databases/py-sqlalchemy-devel/distinfo +++ databases/py-sqlalchemy-devel/distinfo @@ -1,2 +0,0 @@ -SHA256 (SQLAlchemy-0.8.2.tar.gz) = 71ce685f0e643bae95c7d4ace7ff8d6dcb37e99605cab3cf31c2be006c17905f -SIZE (SQLAlchemy-0.8.2.tar.gz) = 3816467 Index: databases/py-sqlalchemy-devel/pkg-descr =================================================================== --- databases/py-sqlalchemy-devel/pkg-descr +++ databases/py-sqlalchemy-devel/pkg-descr @@ -1,10 +0,0 @@ -The Python SQL Toolkit and Object Relational Mapper - -SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that -gives application developers the full power and flexibility of SQL. - -It provides a full suite of well known enterprise-level persistence -patterns, designed for efficient and high-performing database access, -adapted into a simple and Pythonic domain language. - -WWW: http://www.sqlalchemy.org/ Index: databases/py-sqlalchemy-migrate/Makefile =================================================================== --- databases/py-sqlalchemy-migrate/Makefile +++ databases/py-sqlalchemy-migrate/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}Tempita>0:textproc/py-Tempita \ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator Index: databases/py-sqlalchemy/Makefile =================================================================== --- databases/py-sqlalchemy/Makefile +++ databases/py-sqlalchemy/Makefile @@ -1,117 +0,0 @@ -# Created by: Dryice Dong Liu -# $FreeBSD$ - -PORTNAME= sqlalchemy -PORTVERSION= 0.7.10 -PORTREVISION= 2 -CATEGORIES= databases python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= SQLAlchemy-${DISTVERSION} - -MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper - -LICENSE= MIT - -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose - -# Python3 ready -USES= python -USE_PYTHON= distutils autoplist -PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} -PY2TO3_ARGS= --no-diffs --nobackups --verbose --write - -OPTIONS_DEFINE= DOCS EXAMPLES TESTS -OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE -OPTIONS_DEFAULT= SQLITE - -MSSQL_DESC= MS SQL Server backend -TESTS_DESC= Include nose for unit tests -SYBASE_DESC= Sybase backend - -.include - -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} - -.include - -.if ${PORT_OPTIONS:MDOCS} -AL_PORTDOCS= *.html *.js -AL_PORTDOCS_SUBDIR= core dialects orm -.endif - -.if ${PORT_OPTIONS:MMSSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql -.endif - -.if ${PORT_OPTIONS:MMYSQL} -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -#.else -# At the moment databases/py-pymysql does not build with Python3 -# See https://github.com/petehunt/PyMySQL#python-3-0-support -#RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql -.endif -.endif - -.if ${PORT_OPTIONS:MTESTS} -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MSYBASE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase -.endif - -post-patch: - ${REINPLACE_CMD} -e 's/import logging/&.handlers/1' -i.bak ${WRKSRC}/test/engine/test_execute.py - -pre-build: -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib -.endif - -post-install: -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc -.endif - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${AL_PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.for i in ${AL_PORTDOCS_SUBDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} - @cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i} -.endfor - - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - -.if ${PYTHON_REL} < 3000 -PLIST_SUB+= SPEEDUPS="" -.else -# C extensions are not supported in py3k -PLIST_SUB+= SPEEDUPS="@comment " -.endif - -regression-test: build -.if ${PYTHON_REL} >= 3000 - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test -.endif - @cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py - -.include Index: databases/py-sqlalchemy/distinfo =================================================================== --- databases/py-sqlalchemy/distinfo +++ databases/py-sqlalchemy/distinfo @@ -1,2 +0,0 @@ -SHA256 (SQLAlchemy-0.7.10.tar.gz) = 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 -SIZE (SQLAlchemy-0.7.10.tar.gz) = 3541639 Index: databases/py-sqlalchemy/pkg-descr =================================================================== --- databases/py-sqlalchemy/pkg-descr +++ databases/py-sqlalchemy/pkg-descr @@ -1,10 +0,0 @@ -The Python SQL Toolkit and Object Relational Mapper - -SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that -gives application developers the full power and flexibility of SQL. - -It provides a full suite of well known enterprise-level persistence -patterns, designed for efficient and high-performing database access, -adapted into a simple and Pythonic domain language. - -WWW: http://www.sqlalchemy.org/ Index: databases/py-sqlalchemy/pkg-plist =================================================================== --- databases/py-sqlalchemy/pkg-plist +++ databases/py-sqlalchemy/pkg-plist @@ -1,113 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/contents.html -%%PORTDOCS%%%%DOCSDIR%%/copyright.html -%%PORTDOCS%%%%DOCSDIR%%/core/compiler.html -%%PORTDOCS%%%%DOCSDIR%%/core/connections.html -%%PORTDOCS%%%%DOCSDIR%%/core/engines.html -%%PORTDOCS%%%%DOCSDIR%%/core/event.html -%%PORTDOCS%%%%DOCSDIR%%/core/events.html -%%PORTDOCS%%%%DOCSDIR%%/core/exceptions.html -%%PORTDOCS%%%%DOCSDIR%%/core/expression_api.html -%%PORTDOCS%%%%DOCSDIR%%/core/index.html -%%PORTDOCS%%%%DOCSDIR%%/core/interfaces.html -%%PORTDOCS%%%%DOCSDIR%%/core/internals.html -%%PORTDOCS%%%%DOCSDIR%%/core/pooling.html -%%PORTDOCS%%%%DOCSDIR%%/core/schema.html -%%PORTDOCS%%%%DOCSDIR%%/core/serializer.html -%%PORTDOCS%%%%DOCSDIR%%/core/tutorial.html -%%PORTDOCS%%%%DOCSDIR%%/core/types.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/access.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/drizzle.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/firebird.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/index.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/informix.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/maxdb.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/mssql.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/mysql.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/oracle.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/postgresql.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/sqlite.html -%%PORTDOCS%%%%DOCSDIR%%/dialects/sybase.html -%%PORTDOCS%%%%DOCSDIR%%/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/glossary.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/intro.html -%%PORTDOCS%%%%DOCSDIR%%/orm/collections.html -%%PORTDOCS%%%%DOCSDIR%%/orm/deprecated.html -%%PORTDOCS%%%%DOCSDIR%%/orm/events.html -%%PORTDOCS%%%%DOCSDIR%%/orm/examples.html -%%PORTDOCS%%%%DOCSDIR%%/orm/exceptions.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/associationproxy.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/horizontal_shard.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/hybrid.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/index.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/mutable.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/orderinglist.html -%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/sqlsoup.html -%%PORTDOCS%%%%DOCSDIR%%/orm/index.html -%%PORTDOCS%%%%DOCSDIR%%/orm/inheritance.html -%%PORTDOCS%%%%DOCSDIR%%/orm/interfaces.html -%%PORTDOCS%%%%DOCSDIR%%/orm/internals.html -%%PORTDOCS%%%%DOCSDIR%%/orm/loading.html -%%PORTDOCS%%%%DOCSDIR%%/orm/mapper_config.html -%%PORTDOCS%%%%DOCSDIR%%/orm/query.html -%%PORTDOCS%%%%DOCSDIR%%/orm/relationships.html -%%PORTDOCS%%%%DOCSDIR%%/orm/session.html -%%PORTDOCS%%%%DOCSDIR%%/orm/tutorial.html -%%PORTDOCS%%%%DOCSDIR%%/search.html -%%PORTDOCS%%%%DOCSDIR%%/searchindex.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adjacency_list/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adjacency_list/adjacency_list.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/basic_association.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/dict_of_sets_with_default.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/proxied_association.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/advanced.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/caching_query.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/environment.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/fixture_data.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/helloworld.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/local_session_caching.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/model.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beaker_caching/relation_caching.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/custom_management.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/listen_for_events.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/declarative_reflection/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/declarative_reflection/declarative_reflection.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/dynamic_dict.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/adjacency_list.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/optimized_al.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/pickle.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/test.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/test2.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/test3.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/discriminator_on_association.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/table_per_association.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/table_per_related.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphs/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphs/directed_graph.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/concrete.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/polymorph.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/single.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/large_collection/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/large_collection/large_collection.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nested_sets/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nested_sets/nested_sets.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postgis/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postgis/postgis.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/attribute_shard.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioning/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioning/_lib.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioning/history_meta.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioning/test_versioning.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike-polymorphic.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike.py Index: databases/py-sqlalchemy06/Makefile =================================================================== --- databases/py-sqlalchemy06/Makefile +++ databases/py-sqlalchemy06/Makefile @@ -10,14 +10,18 @@ DISTNAME= SQLAlchemy-${DISTVERSION} MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper (series 0.6) +COMMENT= Python SQL toolkit and Object Relational Mapper 0.6.x LICENSE= MIT -# Python3 ready +DEPRECATED= Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10 +EXPIRATION_DATE= 2016-08-20 + USES= python USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy{0[789],10}* + OPTIONS_DEFINE= CEXTENSIONS DOCS EXAMPLES NOSE OPTIONS_MULTI= BACKEND Index: databases/py-sqlalchemy07/Makefile =================================================================== --- databases/py-sqlalchemy07/Makefile +++ databases/py-sqlalchemy07/Makefile @@ -1,7 +1,7 @@ # Created by: Dryice Dong Liu # $FreeBSD$ -PORTNAME= sqlalchemy +PORTNAME= sqlalchemy07 PORTVERSION= 0.7.10 PORTREVISION= 2 CATEGORIES= databases python @@ -10,24 +10,30 @@ DISTNAME= SQLAlchemy-${DISTVERSION} MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper +COMMENT= Python SQL toolkit and Object Relational Mapper 0.7.x LICENSE= MIT +DEPRECATED= Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10 +EXPIRATION_DATE= 2016-08-20 + TEST_DEPENDS:= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose -# Python3 ready USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils + PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --no-diffs --nobackups --verbose --write +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy{0[689],10}* + OPTIONS_DEFINE= DOCS EXAMPLES TESTS OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE +OPTIONS_MULTI_BACKEND= FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE OPTIONS_DEFAULT= SQLITE +FIREBIRD_DESC= Firebird backend MSSQL_DESC= MS SQL Server backend TESTS_DESC= Include nose for unit tests SYBASE_DESC= Sybase backend @@ -44,12 +50,17 @@ AL_PORTDOCS_SUBDIR= core dialects orm .endif +.if ${PORT_OPTIONS:MFIREBIRD} +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/kinterbasdb/__init__.py:databases/kinterbasdb +.endif + .if ${PORT_OPTIONS:MMSSQL} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql .endif .if ${PORT_OPTIONS:MMYSQL} -.if ${PYTHON_VER} < 3.0 +MYSQL_RUN_DEPENDS= +.if ${PYTHON_REL} < 300 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb #.else # At the moment databases/py-pymysql does not build with Python3 @@ -78,13 +89,13 @@ ${REINPLACE_CMD} -e 's/import logging/&.handlers/1' -i.bak ${WRKSRC}/test/engine/test_execute.py pre-build: -.if ${PYTHON_REL} >= 3000 +.if ${PYTHON_REL} >= 300 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib .endif post-install: -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc +.if ${PYTHON_REL} >= 300 + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${STAGEDIR}${WRKSRC}/doc .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${AL_PORTDOCS} @@ -96,12 +107,12 @@ .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} >= 3000 +.if ${PYTHON_REL} >= 300 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples .endif cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 300 PLIST_SUB+= SPEEDUPS="" .else # C extensions are not supported in py3k @@ -109,7 +120,7 @@ .endif regression-test: build -.if ${PYTHON_REL} >= 3000 +.if ${PYTHON_REL} >= 300 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test .endif @cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py Index: databases/py-sqlalchemy08/Makefile =================================================================== --- databases/py-sqlalchemy08/Makefile +++ databases/py-sqlalchemy08/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sqlalchemy -PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTVERSION= 0.8.7 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,86 +10,67 @@ DISTNAME= SQLAlchemy-${DISTVERSION} MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper +COMMENT= Python SQL toolkit and Object Relational Mapper 0.8.x LICENSE= MIT -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock USES= python USE_PYTHON= distutils autoplist -PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} -PY2TO3_ARGS= --no-diffs --nobackups --verbose --write +PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} +PY2TO3_ARGS= --no-diffs --nobackups --verbose --write +TEST_TARGET= do-test -OPTIONS_DEFINE= DOCS EXAMPLES TESTS +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy{0[679],10}* + +OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE OPTIONS_DEFAULT= SQLITE +MSSQL_DESC= MS SQL Server backend SYBASE_DESC= Sybase backend -TESTS_DESC= Include nose for unit tests MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:databases/py-mssql PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>0:databases/py-sybase -TESTS_BUILD_DEPENDS:= ${TEST_DEPENDS} -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} -PORTDOCS= * -PORTEXAMPLES= * +PORTDOCS= * +PORTEXAMPLES= * -.include .include -.if ${PORT_OPTIONS:MDOCS} -AL_PORTDOCS= *.html *.js -AL_PORTDOCS_SUBDIR= core dialects orm -.endif - -.if ${PORT_OPTIONS:MMYSQL} -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +.if ${PYTHON_REL} < 3000 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb #.else # At the moment databases/py-pymysql does not build with Python3 # See https://github.com/petehunt/PyMySQL#python-3-0-support -#RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql -.endif +#MYSQL_RUN_DEPENDS= pymysql>=0.5:databases/py-pymysql .endif -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock -.endif - -.if ${PYTHON_REL} >= 3000 pre-build: +.if ${PYTHON_REL} >= 3000 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples .endif post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.if ${PYTHON_REL} >= 3000 - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc -.endif + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so -.for i in ${AL_PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.for i in ${AL_PORTDOCS_SUBDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} - (cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}) -.endfor +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} >= 3000 - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -regression-test: build +do-test: .if ${PYTHON_REL} >= 3000 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test .endif Index: databases/py-sqlalchemy08/distinfo =================================================================== --- databases/py-sqlalchemy08/distinfo +++ databases/py-sqlalchemy08/distinfo @@ -1,2 +1,3 @@ -SHA256 (SQLAlchemy-0.8.2.tar.gz) = 71ce685f0e643bae95c7d4ace7ff8d6dcb37e99605cab3cf31c2be006c17905f -SIZE (SQLAlchemy-0.8.2.tar.gz) = 3816467 +TIMESTAMP = 1463498186 +SHA256 (SQLAlchemy-0.8.7.tar.gz) = 9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc +SIZE (SQLAlchemy-0.8.7.tar.gz) = 3548308 Index: databases/py-sqlalchemy09/Makefile =================================================================== --- databases/py-sqlalchemy09/Makefile +++ databases/py-sqlalchemy09/Makefile @@ -2,116 +2,78 @@ # $FreeBSD$ PORTNAME= sqlalchemy -PORTVERSION= 0.7.10 -PORTREVISION= 2 +PORTVERSION= 0.9.10 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 09 DISTNAME= SQLAlchemy-${DISTVERSION} -MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper +MAINTAINER= m.tsatsenko@gmail.com +COMMENT= Python SQL toolkit and Object Relational Mapper 0.9.x LICENSE= MIT -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock -# Python3 ready USES= python USE_PYTHON= distutils autoplist + PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --no-diffs --nobackups --verbose --write +TEST_TARGET= do-test + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy{0[678],10}* -OPTIONS_DEFINE= DOCS EXAMPLES TESTS +OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE OPTIONS_DEFAULT= SQLITE MSSQL_DESC= MS SQL Server backend -TESTS_DESC= Include nose for unit tests SYBASE_DESC= Sybase backend -.include +MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +PORTDOCS= * +PORTEXAMPLES= * .include -.if ${PORT_OPTIONS:MDOCS} -AL_PORTDOCS= *.html *.js -AL_PORTDOCS_SUBDIR= core dialects orm -.endif - -.if ${PORT_OPTIONS:MMSSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql -.endif - -.if ${PORT_OPTIONS:MMYSQL} -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +.if ${PYTHON_REL} < 3000 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb #.else # At the moment databases/py-pymysql does not build with Python3 # See https://github.com/petehunt/PyMySQL#python-3-0-support -#RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql -.endif +#MYSQL_RUN_DEPENDS= pymysql>=0.5:databases/py-pymysql .endif -.if ${PORT_OPTIONS:MTESTS} -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MSYBASE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase -.endif - -post-patch: - ${REINPLACE_CMD} -e 's/import logging/&.handlers/1' -i.bak ${WRKSRC}/test/engine/test_execute.py - pre-build: .if ${PYTHON_REL} >= 3000 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples .endif post-install: -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc -.endif + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${AL_PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.for i in ${AL_PORTDOCS_SUBDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} - @cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i} -.endfor + cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} < 3000 -PLIST_SUB+= SPEEDUPS="" -.else -# C extensions are not supported in py3k -PLIST_SUB+= SPEEDUPS="@comment " -.endif - -regression-test: build +pre-test: .if ${PYTHON_REL} >= 3000 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test .endif - @cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py + @cd ${WRKSRC} && py.test .include Index: databases/py-sqlalchemy09/distinfo =================================================================== --- databases/py-sqlalchemy09/distinfo +++ databases/py-sqlalchemy09/distinfo @@ -1,2 +1,3 @@ -SHA256 (SQLAlchemy-0.7.10.tar.gz) = 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 -SIZE (SQLAlchemy-0.7.10.tar.gz) = 3541639 +TIMESTAMP = 1463481163 +SHA256 (SQLAlchemy-0.9.10.tar.gz) = 445cba2d5e36b9334aa06c06e00fbedb71f1b1dd03d1d2763b6cf77b9cd6163b +SIZE (SQLAlchemy-0.9.10.tar.gz) = 4274855 Index: databases/py-sqlalchemy10/Makefile =================================================================== --- databases/py-sqlalchemy10/Makefile +++ databases/py-sqlalchemy10/Makefile @@ -2,116 +2,78 @@ # $FreeBSD$ PORTNAME= sqlalchemy -PORTVERSION= 0.7.10 -PORTREVISION= 2 +PORTVERSION= 1.0.13 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 10 DISTNAME= SQLAlchemy-${DISTVERSION} -MAINTAINER= nivit@FreeBSD.org -COMMENT= Python SQL toolkit and Object Relational Mapper +MAINTAINER= m.tsatsenko@gmail.com +COMMENT= Python SQL toolkit and Object Relational Mapper 1.0.x LICENSE= MIT -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock -# Python3 ready USES= python USE_PYTHON= distutils autoplist + PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --no-diffs --nobackups --verbose --write +TEST_TARGET= do-test + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy0[6789]* -OPTIONS_DEFINE= DOCS EXAMPLES TESTS +OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE OPTIONS_DEFAULT= SQLITE MSSQL_DESC= MS SQL Server backend -TESTS_DESC= Include nose for unit tests SYBASE_DESC= Sybase backend -.include +MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +PORTDOCS= * +PORTEXAMPLES= * .include -.if ${PORT_OPTIONS:MDOCS} -AL_PORTDOCS= *.html *.js -AL_PORTDOCS_SUBDIR= core dialects orm -.endif - -.if ${PORT_OPTIONS:MMSSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-mssql -.endif - -.if ${PORT_OPTIONS:MMYSQL} -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +.if ${PYTHON_REL} < 3000 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb #.else # At the moment databases/py-pymysql does not build with Python3 # See https://github.com/petehunt/PyMySQL#python-3-0-support -#RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql -.endif +#MYSQL_RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql .endif -.if ${PORT_OPTIONS:MTESTS} -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MSYBASE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase -.endif - -post-patch: - ${REINPLACE_CMD} -e 's/import logging/&.handlers/1' -i.bak ${WRKSRC}/test/engine/test_execute.py - pre-build: .if ${PYTHON_REL} >= 3000 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc + @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples .endif post-install: -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc -.endif + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${AL_PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.for i in ${AL_PORTDOCS_SUBDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} - @cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i} -.endfor + cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} >= 3000 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.if ${PYTHON_REL} < 3000 -PLIST_SUB+= SPEEDUPS="" -.else -# C extensions are not supported in py3k -PLIST_SUB+= SPEEDUPS="@comment " -.endif - -regression-test: build +do-test: .if ${PYTHON_REL} >= 3000 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test .endif - @cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py + @cd ${WRKSRC} && py.test .include Index: databases/py-sqlalchemy10/distinfo =================================================================== --- databases/py-sqlalchemy10/distinfo +++ databases/py-sqlalchemy10/distinfo @@ -1,2 +1,3 @@ -SHA256 (SQLAlchemy-0.7.10.tar.gz) = 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 -SIZE (SQLAlchemy-0.7.10.tar.gz) = 3541639 +TIMESTAMP = 1463481609 +SHA256 (SQLAlchemy-1.0.13.tar.gz) = e755fd23b8bd574163d392ae85f41f6cd32eca8fe5bd7b5692de77265bb220cf +SIZE (SQLAlchemy-1.0.13.tar.gz) = 4757399 Index: deskutils/gourmet/Makefile =================================================================== --- deskutils/gourmet/Makefile +++ deskutils/gourmet/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \ ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler \ ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf \ Index: devel/buildbot/Makefile =================================================================== --- devel/buildbot/Makefile +++ devel/buildbot/Makefile @@ -17,7 +17,7 @@ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 TEST_DEPENDS= trial:devel/py-twisted \ ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ Index: games/anki/Makefile =================================================================== --- games/anki/Makefile +++ games/anki/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= lame:audio/lame \ mplayer:multimedia/mplayer \ ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}qt4-network>=4.4:net/py-qt4-network \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \ Index: games/childsplay/Makefile =================================================================== --- games/childsplay/Makefile +++ games/childsplay/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game NO_BUILD= yes Index: multimedia/py-openlp/Makefile =================================================================== --- multimedia/py-openlp/Makefile +++ multimedia/py-openlp/Makefile @@ -15,7 +15,7 @@ ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:databases/py-sqlalchemy + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:databases/py-sqlalchemy07 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \ Index: science/py-obspy/Makefile =================================================================== --- science/py-obspy/Makefile +++ science/py-obspy/Makefile @@ -20,7 +20,7 @@ ${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy07 RUN_DEPENDS:= ${BUILD_DEPENDS} USES= fortran python shebangfix zip Index: www/geeknote/Makefile =================================================================== --- www/geeknote/Makefile +++ www/geeknote/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote \ ${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2 \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \ ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift Index: www/py-flexget/Makefile =================================================================== --- www/py-flexget/Makefile +++ www/py-flexget/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>=0:devel/py-paver RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.5:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.5:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \ ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup \ Index: www/py-imdbpy/Makefile =================================================================== --- www/py-imdbpy/Makefile +++ www/py-imdbpy/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}sqlobject>=0:databases/py-sqlobject OPTIONS_DEFINE= DOCS Index: www/py-rhodecode/Makefile =================================================================== --- www/py-rhodecode/Makefile +++ www/py-rhodecode/Makefile @@ -21,7 +21,7 @@ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \ ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers \ ${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.10:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.10:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \ ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh \ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel \ Index: www/py-turbogears2/Makefile =================================================================== --- www/py-turbogears2/Makefile +++ www/py-turbogears2/Makefile @@ -24,7 +24,7 @@ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}TurboKid>=1.0.4:devel/py-turbokid \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.4:databases/py-sqlalchemy \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.4:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}Chameleon>=2.0:textproc/py-Chameleon \ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako \