Date: Sat, 19 Feb 2011 15:36:29 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/154891: [PATCH] missing dependancy in databases/py-sqlalchemy Message-ID: <201102191536.p1JFaT4X016170@red.freebsd.org> Resent-Message-ID: <201102191540.p1JFe8Yd015360@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154891
>Category: ports
>Synopsis: [PATCH] missing dependancy in databases/py-sqlalchemy
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 19 15:40:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.1-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
devel/py-nose (unittests) is missing in Makefile. It's required by sqlalchemy_nose. But this module is not essential, so I made a patch, which is enabled in OPTIONS macro.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/databases/py-sqlalchemy/Makefile py-sqlalchemy/Makefile
--- /usr/ports/databases/py-sqlalchemy/Makefile 2011-02-12 18:13:57.000000000 +0100
+++ py-sqlalchemy/Makefile 2011-02-19 15:45:25.000000000 +0100
@@ -7,6 +7,7 @@
PORTNAME= sqlalchemy
PORTVERSION= 0.6.6
+PORTREVISION= 1
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -28,8 +29,9 @@
OPTIONS+= MSSQL "support MS SQL Server" off
OPTIONS+= MYSQL "support MySql" on
OPTIONS+= POSTGRE "support PostGreSQL" on
-OPTIONS+= SQLITE "support Sqlite" on
+OPTIONS+= SQLITE "support Sqlite" on
OPTIONS+= SYBASE "support Sybase" off
+OPTIONS+= NOSE "install SQLAlchemy nose plugin" off
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
@@ -69,6 +71,14 @@
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
.endif
+.if defined(WITH_NOSE)
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>=0.11:${PORTSDIR}/devel/py-nose
+PLIST_SUB+= NOSE=""
+.else
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-setup.py
+PLIST_SUB+= NOSE="@comment "
+.endif
+
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff -urN /usr/ports/databases/py-sqlalchemy/files/extra-patch-setup.py py-sqlalchemy/files/extra-patch-setup.py
--- /usr/ports/databases/py-sqlalchemy/files/extra-patch-setup.py 1970-01-01 01:00:00.000000000 +0100
+++ py-sqlalchemy/files/extra-patch-setup.py 2011-02-19 15:45:25.000000000 +0100
@@ -0,0 +1,27 @@
+--- setup.py.orig 2011-01-08 23:20:20.000000000 +0100
++++ setup.py 2011-02-19 15:16:22.000000000 +0100
+@@ -56,7 +56,7 @@
+
+ def find_packages(dir_):
+ packages = []
+- for pkg in ['sqlalchemy', 'sqlalchemy_nose']:
++ for pkg in ['sqlalchemy']:
+ for _dir, subdirectories, files in os.walk(os.path.join(dir_, pkg)):
+ if '__init__.py' in files:
+ lib, fragment = _dir.split(os.sep, 1)
+@@ -85,15 +85,6 @@
+ # TODO: this is nice, but Python 3 support ?
+ # any way to make it not install for build/install ?
+ #setup_requires=["setuptools_hg"],
+-
+- tests_require = ['nose >= 0.11'],
+- test_suite = "nose.collector",
+- entry_points = {
+- 'nose.plugins.0.10': [
+- 'sqlalchemy = sqlalchemy_nose.noseplugin:NoseSQLAlchemy',
+- ]
+- },
+-
+ long_description = """\
+ SQLAlchemy is:
+
diff -urN /usr/ports/databases/py-sqlalchemy/pkg-plist py-sqlalchemy/pkg-plist
--- /usr/ports/databases/py-sqlalchemy/pkg-plist 2010-11-14 10:12:46.000000000 +0100
+++ py-sqlalchemy/pkg-plist 2011-02-19 15:45:25.000000000 +0100
@@ -1,7 +1,7 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/__init__.py
@@ -352,15 +352,15 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyo
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.py
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyc
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyo
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.py
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyc
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyo
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.py
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyc
+%%NOSE%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyo
%%PORTDOCS%%%%DOCSDIR%%/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/core/compiler.html
%%PORTDOCS%%%%DOCSDIR%%/core/connections.html
@@ -462,7 +462,7 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/__init__.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike-polymorphic.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike.py
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose
+%%NOSE%%@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102191536.p1JFaT4X016170>