SF.net SVN: gar:[23253] csw/mgar/pkg/buildbot/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23253
          http://sourceforge.net/p/gar/code/23253
Author:   dmichelsen
Date:     2014-03-19 15:09:52 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
buildbot/trunk: Add private version of sqlalchemy

Modified Paths:
--------------
    csw/mgar/pkg/buildbot/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2014-03-19 14:46:59 UTC (rev 23252)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2014-03-19 15:09:52 UTC (rev 23253)
@@ -25,24 +25,29 @@
 MASTER_SITES = $(PYPI_MIRROR)
 DISTFILES += $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Use-private-version-of-sqlalchemy.patch
+
 PACKAGES += CSWbuildbot
 SPKG_DESC_CSWbuildbot = A system to automate the compile/test cycle
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-twisted
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-zope-interface
-RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-sqlalchemy
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-jinja2
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-tempita
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-decorator
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-openssl
+# This is in fact an old 0.7.10 version private to buildbot. The documentation says
+#   "The requirement to install SQLAlchemy-0.7.10 is due to a conflict between newer
+#    versions of SQLAlchemy and SQLAlchemy-Migrate."
+RUNTIME_DEP_PKGS_CSWbuildbot += CSWbuildbot-sqlalchemy
 
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted
-CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-sqlalchemy
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-jinja2
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-tempita
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-decorator
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-openssl
+CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWbuildbot-sqlalchemy
 
 # This is more like an application than a python module
 CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy-

Added: csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch	                        (rev 0)
+++ csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch	2014-03-19 15:09:52 UTC (rev 23253)
@@ -0,0 +1,23 @@
+From 05c10c10c31f60c4c7cce17c846616d69589b349 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 19 Mar 2014 16:05:53 +0100
+Subject: [PATCH] Use private version of sqlalchemy
+
+---
+ bin/buildbot | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/bin/buildbot b/bin/buildbot
+index 7295b00..8d5d21f 100755
+--- a/bin/buildbot
++++ b/bin/buildbot
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
+ 
+ from buildbot.scripts import runner
++import sys
++sys.path.insert(0,'/opt/csw/share/buildbot/lib/python2.7/site-packages/')
+ runner.run()
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.