Date: Wed, 24 Aug 2011 13:00:21 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160059: [UPDATE] databases/py-sqlobject: update to 1.1.2 Message-ID: <201108241300.p7OD0LFK013762@red.freebsd.org> Resent-Message-ID: <201108241310.p7ODAAT3097109@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160059
>Category: ports
>Synopsis: [UPDATE] databases/py-sqlobject: update to 1.1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 24 13:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- update to 1.1.2
- pet portlint (RUN_DEPENDS:=)
- bump USE_PYTHON to 2.5+ (the point is to not depend on python24)
- since it now requires 2.5+ use databases/py-sqlite3 instead of
databases/py-pysqlite2x
I checked the source. They use this pattern when dealing with sqlite:
"""
if driver in ('sqlite2', 'pysqlite2'):
from pysqlite2 import dbapi2 as sqlite
self.using_sqlite2 = True
elif driver == 'sqlite3':
import sqlite3 as sqlite
self.using_sqlite2 = True
"""
So nothing will be broken with sqlite3.
changelog:
http://packages.python.org/SQLObject/News.html#sqlobject-1-1-2
tinderbuild logs:
7.4: http://happy-nation.by.ru/ports/tb/7.4/py27-sqlobject-1.1.2.log
8.2: http://happy-nation.by.ru/ports/tb/8.2/py27-sqlobject-1.1.2.log
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruNa py-sqlobject.orig/Makefile py-sqlobject/Makefile
--- py-sqlobject.orig/Makefile 2011-06-27 13:21:04.000000000 +0400
+++ py-sqlobject/Makefile 2011-08-24 16:33:13.000000000 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= sqlobject
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.2
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +16,9 @@
COMMENT= A python object for manipulation with SQL table row
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:${PORTSDIR}/www/py-formencode
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
+USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
PYDISTUTILS_PKGNAME= SQLObject
PYDISTUTILS_NOEGGINFO= yes
@@ -45,7 +45,7 @@
.endif
.if defined(WITH_SQLITE)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
.endif
.if defined(WITH_MSSQL)
diff -ruNa py-sqlobject.orig/distinfo py-sqlobject/distinfo
--- py-sqlobject.orig/distinfo 2011-06-27 13:21:04.000000000 +0400
+++ py-sqlobject/distinfo 2011-08-24 16:17:46.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (SQLObject-1.1.0.tar.gz) = f9576560141b0b8e385c8576c2a83d1ddfa84726b85ea4215e15ac87b79fee7c
-SIZE (SQLObject-1.1.0.tar.gz) = 257492
+SHA256 (SQLObject-1.1.2.tar.gz) = f32501310263311972cec180bf57b843d58e98cbe9b07d35cd74b660c81484bf
+SIZE (SQLObject-1.1.2.tar.gz) = 257751
diff -ruNa py-sqlobject.orig/pkg-plist py-sqlobject/pkg-plist
--- py-sqlobject.orig/pkg-plist 2011-03-29 06:50:54.000000000 +0400
+++ py-sqlobject/pkg-plist 2011-08-24 16:37:48.000000000 +0400
@@ -1,3 +1,5 @@
+bin/sqlobject-admin
+bin/sqlobject-convertOldURI
%%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
@@ -7,6 +9,9 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sqlobject-admin
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sqlobject-convertOldURI
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__init__.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__version__.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__version__.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__version__.pyo
@@ -43,33 +48,33 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/events.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/events.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/firebirdconnection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/firebirdconnection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/firebirdconnection.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/__init__.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/__init__.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/hashcol.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/hashcol.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/hashcol.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/firebirdconnection.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/firebirdconnection.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird/firebirdconnection.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/__init__.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/__init__.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/hashcol.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/hashcol.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/hashcol.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/__init__.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/dispatcher.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/dispatcher.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/dispatcher.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/errors.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/errors.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/errors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robustapply.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robustapply.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robustapply.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robust.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robust.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robust.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robustapply.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robustapply.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/robustapply.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/saferef.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/saferef.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch/saferef.pyo
@@ -82,21 +87,18 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/inheritance/iteration.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/inheritance/iteration.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/inheritance/iteration.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/__init__.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/joins.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/joins.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/joins.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/main.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/main.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/main.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/command.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/command.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/command.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/__init__.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/__init__.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/command.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/command.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager/command.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/maxdb/__init__.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/maxdb/__init__.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/maxdb/__init__.pyo
@@ -148,15 +150,15 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sybase/sybaseconnection.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sybase/sybaseconnection.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sybase/sybaseconnection.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/__init__.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/csvexport.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/csvexport.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/csvexport.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/csvimport.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/csvimport.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/csvimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/__init__.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/moduleloader.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/moduleloader.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util/moduleloader.pyo
@@ -172,23 +174,21 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/wsgi_middleware.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/wsgi_middleware.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/wsgi_middleware.pyo
-bin/sqlobject-admin
-bin/sqlobject-convertOldURI
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/versioning
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sybase
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sqlite
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/rdbhost
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/postgres
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/mysql
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/mssql
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/maxdb
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/inheritance
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include/pydispatch
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/include
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/inheritance
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/manager
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/maxdb
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/mssql
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/mysql
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/postgres
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/rdbhost
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sqlite
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/sybase
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/util
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/versioning
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject/firebird
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlobject
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108241300.p7OD0LFK013762>