svn commit: r415627 - in head: . databases databases/py-alembic databases/py-flask-sqlalchemy databases/py-geoalchemy databases/py-geoalchemy2 databases/py-sqlalchemy databases/py-sqlalchemy-devel ...
Matthew Seaman
matthew at FreeBSD.org
Sun May 22 10:52:49 UTC 2016
Author: matthew
Date: Sun May 22 10:52:44 2016
New Revision: 415627
URL: https://svnweb.freebsd.org/changeset/ports/415627
Log:
Reorganise and modernise the py-sqlalchemy ports.
- Introduce new ports for the sqlalchemy 0.9 and 1.0 release branches.
- Deprecate the ports for the 0.6 and 0.7 release branches, as these
have been declared EoL and are no longer supported by upstream.
- Update to the latest available version in each branch.
In detail:
Port Version Maintainer
----------------------------------------------
py-sqlalchemy06 0.6.9 nivit at FreeBSD.org (Deprecate 2016-08-20) [1]
py-sqlalchemy07 0.7.10 nivit at FreeBSD.org (renamed py-sqlalchemy, Deprecate 2016-08-20) [1]
py-sqlalchemy08 0.8.7 nivit at FreeBSD.org (renamed py-sqlalchemy-devel) [1]
py-sqlalchemy09 0.9.10 m.tsatsenko at gmail.com (new, repocopy from py-sqlalchemy-devel) [2]
py-sqlalchemy10 1.0.13 m.tsatsenko at gmail.com (new, repocopy from py-sqlalchemy-devel) [2]
- Use options-helpers and option dependent make targets.
- Use autoplist for documents as well as python code
- Add all the docments to the packages: previously an arbitrary
subset was added in a way that excluded CSS, images and other HTML
assets.
- Use TEST_DEPENDS and add a TEST_TARGET instead of having a 'TEST'
option.
- Use py-pytest for 0.9.x and later, rather than py-nose.
- Add CONFLICTS_INSTALL between all of the py-sqlalchemyXY ports.
PR: 191442
Submitted by: robak
Reviewed by: robak
Reviewed by: pi
Approved by: nivit (maintainer timeout, ~300days) [1]
Approved by: m.tsatsenko at gmail.com (maintainer) [2]
Sponsored by: https://reviews.freebsd.org/D908
Added:
head/databases/py-sqlalchemy07/
- copied from r415377, head/databases/py-sqlalchemy/
head/databases/py-sqlalchemy08/
- copied from r415626, head/databases/py-sqlalchemy-devel/
head/databases/py-sqlalchemy09/
- copied from r415377, head/databases/py-sqlalchemy/
head/databases/py-sqlalchemy10/
- copied from r415626, head/databases/py-sqlalchemy/
Deleted:
head/databases/py-sqlalchemy/
head/databases/py-sqlalchemy-devel/
head/databases/py-sqlalchemy07/pkg-plist
head/databases/py-sqlalchemy09/pkg-plist
head/databases/py-sqlalchemy10/pkg-plist
Modified:
head/MOVED
head/databases/Makefile
head/databases/py-alembic/Makefile
head/databases/py-flask-sqlalchemy/Makefile
head/databases/py-geoalchemy/Makefile
head/databases/py-geoalchemy2/Makefile
head/databases/py-sqlalchemy-migrate/Makefile
head/databases/py-sqlalchemy06/Makefile
head/databases/py-sqlalchemy07/Makefile
head/databases/py-sqlalchemy07/distinfo
head/databases/py-sqlalchemy08/Makefile
head/databases/py-sqlalchemy08/distinfo
head/databases/py-sqlalchemy09/Makefile
head/databases/py-sqlalchemy09/distinfo
head/databases/py-sqlalchemy10/Makefile
head/databases/py-sqlalchemy10/distinfo
head/deskutils/gourmet/Makefile
head/devel/buildbot/Makefile
head/games/anki/Makefile
head/games/childsplay/Makefile
head/games/pyfa/Makefile
head/irc/py-limnoria/Makefile
head/math/py-pandas/Makefile
head/multimedia/py-openlp/Makefile
head/net/py-kombu/Makefile
head/science/py-obspy/Makefile
head/textproc/py-wtforms/Makefile
head/www/geeknote/Makefile
head/www/py-bottle-cork/Makefile
head/www/py-flexget/Makefile
head/www/py-imdbpy/Makefile
head/www/py-rhodecode/Makefile
head/www/py-turbogears2/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun May 22 09:34:52 2016 (r415626)
+++ head/MOVED Sun May 22 10:52:44 2016 (r415627)
@@ -8326,3 +8326,5 @@ devel/py-gyp-devel|devel/py-gyp|2016-05-
sysutils/relaunchd|sysutils/jobd|2016-05-20|Renamed to sysutils/jobd
dns/nsd3|dns/nsd|2016-05-20|Has expired: NSD 3 is EOL, please upgrade to NSD 4 in dns/nsd
security/easypg||2016-05-22|Has expired: Included into emacs since 2.3
+databases/py-sqlalchemy|databases/py-sqlalchemy07|2016-05-18|Renamed to databases/py-sqlalchemy07
+databases/py-sqlalchemy-devel|databases/py-sqlalchemy08|2016-05-18|Renamed to databases/py-sqlalchemy08
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -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
Modified: head/databases/py-alembic/Makefile
==============================================================================
--- head/databases/py-alembic/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-alembic/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -11,7 +11,7 @@ COMMENT= Database migration tool for SQL
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.3:databases/py-sqlalchemy \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.7.3:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako
USES= python
Modified: head/databases/py-flask-sqlalchemy/Makefile
==============================================================================
--- head/databases/py-flask-sqlalchemy/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-flask-sqlalchemy/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ COMMENT= Adds SQLAlchemy support to Flas
LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.7:databases/py-sqlalchemy07
USES= python
USE_PYTHON= distutils autoplist
Modified: head/databases/py-geoalchemy/Makefile
==============================================================================
--- head/databases/py-geoalchemy/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-geoalchemy/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ COMMENT= Using SQLAlchemy with Spatial D
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:databases/py-sqlalchemy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.6.1:databases/py-sqlalchemy07
USE_PYTHON= autoplist distutils
USES= python:2
Modified: head/databases/py-geoalchemy2/Makefile
==============================================================================
--- head/databases/py-geoalchemy2/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-geoalchemy2/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ COMMENT= Using SQLAlchemy with Spatial D
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
Modified: head/databases/py-sqlalchemy-migrate/Makefile
==============================================================================
--- head/databases/py-sqlalchemy-migrate/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-sqlalchemy-migrate/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ COMMENT= Database schema migrations for
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:databases/py-sqlalchemy \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.7:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}Tempita>0:textproc/py-Tempita \
${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator
Modified: head/databases/py-sqlalchemy06/Makefile
==============================================================================
--- head/databases/py-sqlalchemy06/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-sqlalchemy06/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -10,14 +10,18 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= SQLAlchemy-${DISTVERSION}
MAINTAINER= nivit at 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
Modified: head/databases/py-sqlalchemy07/Makefile
==============================================================================
--- head/databases/py-sqlalchemy/Makefile Tue May 17 08:27:04 2016 (r415377)
+++ head/databases/py-sqlalchemy07/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -3,76 +3,60 @@
PORTNAME= sqlalchemy
PORTVERSION= 0.7.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= 07
DISTNAME= SQLAlchemy-${DISTVERSION}
MAINTAINER= nivit at FreeBSD.org
-COMMENT= Python SQL toolkit and Object Relational Mapper
+COMMENT= Python SQL toolkit and Object Relational Mapper 0.7.x
LICENSE= MIT
-TEST_DEPENDS:= ${RUN_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+DEPRECATED= Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10
+EXPIRATION_DATE= 2016-08-20
+
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
-# 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
+TEST_TARGET= do-test
-OPTIONS_DEFINE= DOCS EXAMPLES TESTS
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy{0[689],10}*
+
+OPTIONS_DEFINE= DOCS EXAMPLES
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
-.include <bsd.port.options.mk>
+FIREBIRD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kinterbasdb/__init__.py:databases/kinterbasdb
+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
-DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS= *
+PORTEXAMPLES= *
.include <bsd.port.pre.mk>
-.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
-.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
@@ -80,35 +64,24 @@ post-patch:
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
+# C extensions are not supported with all versions of Python, so ignore
+# errors here if there are no .so files to strip.
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
Modified: head/databases/py-sqlalchemy07/distinfo
==============================================================================
--- head/databases/py-sqlalchemy/distinfo Tue May 17 08:27:04 2016 (r415377)
+++ head/databases/py-sqlalchemy07/distinfo Sun May 22 10:52:44 2016 (r415627)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1463753628
SHA256 (SQLAlchemy-0.7.10.tar.gz) = 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66
SIZE (SQLAlchemy-0.7.10.tar.gz) = 3541639
Modified: head/databases/py-sqlalchemy08/Makefile
==============================================================================
--- head/databases/py-sqlalchemy-devel/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-sqlalchemy08/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -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,69 @@ PKGNAMESUFFIX= 08
DISTNAME= SQLAlchemy-${DISTVERSION}
MAINTAINER= nivit at 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 <bsd.port.options.mk>
.include <bsd.port.pre.mk>
-.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
+# C extensions are not supported with all versions of Python, so ignore
+# errors here if there are no .so files to strip.
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
Modified: head/databases/py-sqlalchemy08/distinfo
==============================================================================
--- head/databases/py-sqlalchemy-devel/distinfo Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-sqlalchemy08/distinfo Sun May 22 10:52:44 2016 (r415627)
@@ -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
Modified: head/databases/py-sqlalchemy09/Makefile
==============================================================================
--- head/databases/py-sqlalchemy/Makefile Tue May 17 08:27:04 2016 (r415377)
+++ head/databases/py-sqlalchemy09/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -2,116 +2,80 @@
# $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 at FreeBSD.org
-COMMENT= Python SQL toolkit and Object Relational Mapper
+MAINTAINER= m.tsatsenko at 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 <bsd.port.options.mk>
+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 <bsd.port.pre.mk>
-.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
+# C extensions are not supported with all versions of Python, so ignore
+# errors here if there are no .so files to strip.
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 <bsd.port.post.mk>
Modified: head/databases/py-sqlalchemy09/distinfo
==============================================================================
--- head/databases/py-sqlalchemy/distinfo Tue May 17 08:27:04 2016 (r415377)
+++ head/databases/py-sqlalchemy09/distinfo Sun May 22 10:52:44 2016 (r415627)
@@ -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
Modified: head/databases/py-sqlalchemy10/Makefile
==============================================================================
--- head/databases/py-sqlalchemy/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-sqlalchemy10/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -2,116 +2,80 @@
# $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 at FreeBSD.org
-COMMENT= Python SQL toolkit and Object Relational Mapper
+MAINTAINER= m.tsatsenko at 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 <bsd.port.options.mk>
+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 <bsd.port.pre.mk>
-.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
+# C extensions are not supported with all versions of Python, so ignore
+# errors here if there are no .so files to strip.
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 <bsd.port.post.mk>
Modified: head/databases/py-sqlalchemy10/distinfo
==============================================================================
--- head/databases/py-sqlalchemy/distinfo Sun May 22 09:34:52 2016 (r415626)
+++ head/databases/py-sqlalchemy10/distinfo Sun May 22 10:52:44 2016 (r415627)
@@ -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
Modified: head/deskutils/gourmet/Makefile
==============================================================================
--- head/deskutils/gourmet/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/deskutils/gourmet/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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}sqlalchemy07>=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 \
Modified: head/devel/buildbot/Makefile
==============================================================================
--- head/devel/buildbot/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/devel/buildbot/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twis
${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}sqlalchemy07>=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 \
Modified: head/games/anki/Makefile
==============================================================================
--- head/games/anki/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/games/anki/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= lame:audio/lame \
mplayer:multimedia/mplayer \
${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>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 \
Modified: head/games/childsplay/Makefile
==============================================================================
--- head/games/childsplay/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/games/childsplay/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ LICENSE= GPLv3 # only
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}sqlalchemy07>0:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
NO_BUILD= yes
Modified: head/games/pyfa/Makefile
==============================================================================
--- head/games/pyfa/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/games/pyfa/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:databases/py-sqlalchemy \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.6:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests
USE_GITHUB= yes
Modified: head/irc/py-limnoria/Makefile
==============================================================================
--- head/irc/py-limnoria/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/irc/py-limnoria/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}char
${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg \
${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks \
${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa
Modified: head/math/py-pandas/Makefile
==============================================================================
--- head/math/py-pandas/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/math/py-pandas/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -19,7 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
TEST_DEPENDS:= ${RUN_DEPENDS} \
nosetests-${PYTHON_VER}:devel/py-nose \
cython:lang/cython \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:databases/py-sqlalchemy08 \
${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables \
@@ -51,7 +51,7 @@ BTLNCK_DESC= Accelerate certain NaN eval
NUMEXPR_DESC= Accelerate certain numerical ops via math/py-numexpr
BOTO_DESC= Support Amazon S3 storage via devel/py-boto
TABLES_DESC= Support HDF5-based storage via devel/py-tables
-SQL_DESC= Support SQL databases via databases/py-sqlalchemy
+SQL_DESC= Support SQL databases via databases/py-sqlalchemy08
LXML_DESC= Parse HTML with devel/py-lxml and www/py-beautifulsoup
JINJA2_DESC= Support conditional HTML formatting with devel/py-Jinja2
HTML5LIB_DESC= Parse HTML with www/py-html5lib and www/py-beautifulsoup
@@ -70,12 +70,7 @@ BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREF
NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.1.0:math/py-numexpr
BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto
TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables
-# Note: upstream recommends SQLAlchemy 0.8.1 or higher, which is not
-# available in the ports tree as of this writing
-# See: https://reviews.freebsd.org/D908
-# See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191442
-# See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205852
-SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy
+SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:databases/py-sqlalchemy08
LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
Modified: head/multimedia/py-openlp/Makefile
==============================================================================
--- head/multimedia/py-openlp/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/multimedia/py-openlp/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -15,12 +15,12 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si
${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}sqlalchemy07>=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 \
${PYTHON_PKGNAMEPREFIX}qt4-phonon>=0:multimedia/py-qt4-phonon \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.5:databases/py-sqlalchemy \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0.5:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:www/py-qt4-webkit \
${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
Modified: head/net/py-kombu/Makefile
==============================================================================
--- head/net/py-kombu/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/net/py-kombu/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -28,7 +28,7 @@ BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEP
BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto
MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>0:databases/py-sqlalchemy07
ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq
Modified: head/science/py-obspy/Makefile
==============================================================================
--- head/science/py-obspy/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/science/py-obspy/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYNUMPY} \
${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}sqlalchemy07>=0:databases/py-sqlalchemy07
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= fortran python shebangfix zip
Modified: head/textproc/py-wtforms/Makefile
==============================================================================
--- head/textproc/py-wtforms/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/textproc/py-wtforms/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:databases/py-sqlalchemy-devel \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:databases/py-sqlalchemy08 \
${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
Modified: head/www/geeknote/Makefile
==============================================================================
--- head/www/geeknote/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/www/geeknote/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -13,7 +13,7 @@ LICENSE= GPLv2
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}sqlalchemy07>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
Modified: head/www/py-bottle-cork/Makefile
==============================================================================
--- head/www/py-bottle-cork/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/www/py-bottle-cork/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -27,7 +27,7 @@ OPTIONS_DEFINE= SQLITE MONGODB SQLALCHE
SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:databases/py-sqlalchemy
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>0:databases/py-sqlalchemy07
.if ${PORT_OPTIONS:MEXAMPLES}
post-install:
Modified: head/www/py-flexget/Makefile
==============================================================================
--- head/www/py-flexget/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/www/py-flexget/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -16,7 +16,7 @@ LICENSE= MIT
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}sqlalchemy07>=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 \
Modified: head/www/py-imdbpy/Makefile
==============================================================================
--- head/www/py-imdbpy/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/www/py-imdbpy/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -17,7 +17,7 @@ LICENSE_COMB= dual
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}sqlalchemy07>=0:databases/py-sqlalchemy07 \
${PYTHON_PKGNAMEPREFIX}sqlobject>=0:databases/py-sqlobject
OPTIONS_DEFINE= DOCS
Modified: head/www/py-rhodecode/Makefile
==============================================================================
--- head/www/py-rhodecode/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/www/py-rhodecode/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylo
${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}sqlalchemy07>=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 \
Modified: head/www/py-turbogears2/Makefile
==============================================================================
--- head/www/py-turbogears2/Makefile Sun May 22 09:34:52 2016 (r415626)
+++ head/www/py-turbogears2/Makefile Sun May 22 10:52:44 2016 (r415627)
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Tosc
${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}sqlalchemy07>=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 \
More information about the svn-ports-all
mailing list