Permalink
Browse files

Remove cruft from buildouts, isolate ldap in Pleiades production, start

working toward 3.3.6.
  • Loading branch information...
1 parent f72a0ed commit c709e293ab4100953b9e645bddb223a967d7c04d @sgillies sgillies committed Apr 3, 2012
Showing with 119 additions and 334 deletions.
  1. 0 335-versions.cfg
  2. +5 −38 buildout.cfg
  3. +14 −6 devel.cfg
  4. +28 −0 discussion.cfg
  5. +4 −9 pleiades-production.cfg
  6. +43 −40 plone335.cfg → plone336.cfg
  7. +0 −219 production.cfg
  8. +3 −8 test-production.cfg
  9. +22 −14 versions.cfg
View
No changes.
View
@@ -1,10 +1,9 @@
-#Get Shapely from our own index to work around ctypes dependency problem
-[home]
-eggcarton = /home/zope/pleiades/eggcarton
[buildout]
+extends = plone336.cfg discussion.cfg versions.cfg
+versions = versions
+
parts =
-# agx-scripts
pil-src
pil-install
cython-src
@@ -18,8 +17,6 @@ parts =
pyproj
libgeos
shapely
-# libspatialindex
-# rtree
PleiadesEntity
zope2
productdistros
@@ -31,17 +28,12 @@ parts =
pai-patch
find-links =
- ${home:eggcarton}
http://dist.plone.org/
http://effbot.org/downloads
-extends = plone335.cfg http://good-py.appspot.com/release/plone.app.discussion/1.0 versions.cfg
-versions = versions
-
eggs =
nose
elementtree
- geopy
simplejson
uuid
imsvdex
@@ -50,8 +42,6 @@ eggs =
Plone
Products.CompoundField
Products.ATBackRef
- plone.app.ldap
- Products.PloneLDAP
Products.CacheSetup
zgeo.geographer
zgeo.plone.geographer
@@ -70,11 +60,9 @@ eggs =
pleiades.atom
pleiades.json
pleiades.openlayers
-# pleiades.portlet.references
pleiades.notredame
pleiades.capgrids
pleiades.sitemap
- pleiades.placematch
pleiades.reconciliation
pleiades.dump
pleiades.bulkup
@@ -89,9 +77,6 @@ eggs =
pleiades.rdf
pleiades.iterate
pleiades.portlet.flickr
-# Rtree
-# zgeo.rtree
-# zgeo.spatialindex
[python]
executable = ${buildout:directory}/bin/python2.4
@@ -174,21 +159,6 @@ library-dirs =
${libgeos:location}/lib
libraries = geos
-#[libspatialindex]
-#recipe = hexagonit.recipe.cmmi
-#url = http://trac.gispython.org/projects/SpatialIndex/attachment/wiki/Releases/spatialindex-1.3.2.tar.gz?format=raw
-
-#[rtree]
-#recipe = zc.recipe.egg:custom
-#egg = Rtree
-#include-dirs =
-# ${libspatialindex:location}/include
-#library-dirs =
-# ${libspatialindex:location}/lib
-#rpath =
-# ${libspatialindex:location}/lib
-#libraries = spatialindex
-
[PleiadesEntity]
recipe = infrae.subversion
location = products
@@ -242,18 +212,15 @@ zope2-location = ${zope2:location}
user = admin:admin
http-address = 9080
environment-vars =
-# LD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libspatialindex:location}/lib
LD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib
-# DYLD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libspatialindex:location}/lib
- GMAPS_KEY ABQIAAAAtVyXL2o7HAFbw73xSniLfhQ2dHhbVVaz2wAxXxViKF6CJLVMtxSsxoh3qq0OgSXQYgR-U7rv12D-cQ
+ DYLD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib
VAYTROU_URI http://localhost:8889
eggs =
${buildout:eggs}
${pyproj:eggs}
${shapely:eggs}
ZPublisherEventsBackport
zcml =
- plone.app.ldap
pleiades.policy
pleiades.notredame
pleiades.placematch
@@ -279,4 +246,4 @@ files = setenv
libgeos = ${libgeos:location}/lib
libxml2 = ${libxml2:location}/lib
libxslt = ${libxslt:location}/lib
-#libspatialindex = ${libspatialindex:location}/lib
+
View
@@ -1,8 +1,7 @@
# Development buildout
[buildout]
-extends =
- buildout.cfg
+extends = buildout.cfg
parts -= PleiadesEntity
parts += nosetest
develop =
@@ -27,8 +26,17 @@ develop =
src/pleiades.notredame
src/pleiades.capgrids
src/pleiades.sitemap
-# src/zgeo.rtree
-# src/zgeo.spatialindex
+ src/pleiades.reconciliation
+ src/pleiades.dump
+ src/pleiades.bulkup
+ src/pleiades.contentratings
+ src/pleiades.rdf
+ src/pleiades.iterate
+ src/pleiades.portlet.flickr
+ src/pleiades.geographer
+ src/pleiades.neighbors
+ src/pleiades.vaytrouindex
+ src/pleiades.placematch
[instance]
debug-mode = on
@@ -43,8 +51,8 @@ eggs =
environment = test-env
[test-env]
-LD_LIBRARY_PATH = ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libspatialindex:location}/lib
-DYLD_LIBRARY_PATH = ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libspatialindex:location}/lib
+LD_LIBRARY_PATH = ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib
+DYLD_LIBRARY_PATH = ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib
GMAPS_KEY = ABQIAAAAtVyXL2o7HAFbw73xSniLfhQ2dHhbVVaz2wAxXxViKF6CJLVMtxSsxoh3qq0OgSXQYgR-U7rv12D-cQ
[roadrunner]
View
@@ -0,0 +1,28 @@
+# Known good set for plone.app.discussion version 1.0
+# The latest version can be found at
+# http://good-py.appspot.com/release/plone.app.discussion/1.0
+
+[versions]
+Products.PloneTestCase = 0.9.8
+collective.autopermission = 1.0b1
+collective.monkeypatcher = 1.0b2
+collective.z3cform.datetimewidget = 0.1a9
+plone.app.registry = 1.0b1
+plone.app.z3cform = 0.4.9
+plone.autoform = 1.0b2
+plone.registry = 1.0b1
+plone.supermodel = 1.0b4
+plone.z3cform = 0.5.10
+z3c.batching = 1.1.0
+z3c.form = 2.3.3
+z3c.formwidget.query = 0.3
+zope.app.broken = 3.4.0
+zope.component = 3.5.1
+zope.container = 3.7.0
+zope.i18n = 3.4.0
+zope.location = 3.4.0
+zope.schema = 3.6.4
+zope.security = 3.4.3
+zope.site = 3.5.1
+zope.testing = 3.8.1
+
View
@@ -3,11 +3,8 @@
eggcarton = /home/zope/pleiades/eggcarton
[buildout]
-extends =
- buildout.cfg
+extends = buildout.cfg production-versions.cfg
versions = versions
-parts -=
- agx-scripts
parts +=
zeoserver
instance1
@@ -29,11 +26,8 @@ varnish = http://downloads.sourceforge.net/varnish/varnish-2.0.4.tar.gz
[instance-settings]
environment-vars =
- LD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libspatialindex:location}/lib
- DYLD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libspatialindex:location}/lib
-# GMAPS_KEY ABQIAAAAtVyXL2o7HAFbw73xSniLfhS1bBBDlMKxw1t-uONc1DBxgSUDhRQCjVu0dx_SOp9Wc0Z6Wx2qFa8w8Q
- GMAPS_KEY ABQIAAAAtVyXL2o7HAFbw73xSniLfhSojaX1t1STtZgEm2XSl65R-0GV_BR2MZGMSbQ8gGXzadmo6Ge8Uqf5vw
-# ABQIAAAAtVyXL2o7HAFbw73xSniLfhQ2dHhbVVaz2wAxXxViKF6CJLVMtxSsxoh3qq0OgSXQYgR-U7rv12D-cQ
+ LD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib
+ DYLD_LIBRARY_PATH ${libgeos:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib
eggs =
${buildout:eggs}
${pyproj:eggs}
@@ -61,6 +55,7 @@ zeo-client = true
zeo-address = ${zeoserver:zeo-address}
effective-user = ${users:zope}
http-address = $${:http-address}
+
[supervisor-settings]
user = admin
password = xxxxxx
@@ -1,59 +1,61 @@
[versions]
# Buildout infrastructure
-plone.recipe.zope2install = 3.2
-plone.recipe.zope2instance = 3.6
+distribute = 0.6.15
+plone.recipe.zope2install = 3.3
+plone.recipe.zope2instance = 3.10
plone.recipe.zope2zeoserver = 1.4
setuptools = 0.6c11
-zc.buildout = 1.4.3
+zc.buildout = 1.4.4
zc.recipe.egg = 1.2.2
# Zope
-zope2-url = http://www.zope.org/Products/Zope/2.10.11/Zope-2.10.11-final.tgz
+zope2-url = http://www.zope.org/Products/Zope/2.10.13/Zope-2.10.13-final.tgz
# External dependencies
Markdown = 1.7
PIL = 1.1.6
elementtree = 1.2.7-20070827-preview
feedparser = 4.1
-python-openid = 2.2.4
+python-openid = 2.2.5
simplejson = 2.0.9
+mailinglogger = 3.3.3
# Plone release
-Plone = 3.3.5
-Products.ATContentTypes = 1.3.4
-Products.ATReferenceBrowserWidget = 2.0.5
+Plone = 3.3.6
+Products.ATContentTypes = 1.3.7
+Products.ATReferenceBrowserWidget = 2.0.7
Products.AdvancedQuery = 3.0
-Products.Archetypes = 1.5.15
-Products.CMFActionIcons = 2.1.2
-Products.CMFCalendar = 2.1.2
-Products.CMFCore = 2.1.2
-Products.CMFDefault = 2.1.2
+Products.Archetypes = 1.5.17
+Products.CMFActionIcons = 2.1.3
+Products.CMFCalendar = 2.1.3
+Products.CMFCore = 2.1.3
+Products.CMFDefault = 2.1.3
Products.CMFDiffTool = 0.5.2
Products.CMFDynamicViewFTI = 3.0.2
-Products.CMFEditions = 1.2.6
+Products.CMFEditions = 1.2.8
Products.CMFFormController = 2.1.2
Products.CMFPlacefulWorkflow = 1.4.2
-Products.CMFQuickInstallerTool = 2.1.7
-Products.CMFTestCase = 0.9.9
+Products.CMFQuickInstallerTool = 2.1.8
+Products.CMFTestCase = 0.9.11
Products.CMFTopic = 2.1.2
-Products.CMFUid = 2.1.2
+Products.CMFUid = 2.1.3
Products.DCWorkflow = 2.1.2
Products.ExtendedPathIndex = 2.6
Products.ExternalEditor = 1.0a1
-Products.GenericSetup = 1.4.5
+Products.GenericSetup = 1.4.6
Products.GroupUserFolder = 3.55.1
Products.Marshall = 1.2.1
Products.MimetypesRegistry = 1.6.4
Products.NuPlone = 1.0b3
Products.PasswordResetTool = 1.4
Products.PlacelessTranslationService = 1.5.4
Products.PloneLanguageTool = 3.0.3
-Products.PlonePAS = 3.12
-Products.PloneTestCase = 0.9.9
-Products.PluggableAuthService = 1.6.3
+Products.PlonePAS = 3.14
+Products.PloneTestCase = 0.9.13
+Products.PluggableAuthService = 1.6.5
Products.PluginRegistry = 1.1.3.1
-Products.PortalTransforms = 1.6.8
-Products.ResourceRegistries = 1.5.4.1
+Products.PortalTransforms = 1.6.13
+Products.ResourceRegistries = 1.5.7
Products.SecureMailHost = 1.1.2
Products.ZopeVersionControl = 1.0a1
Products.i18ntestcase = 1.2
@@ -63,41 +65,42 @@ Products.validation = 1.6.4
archetypes.kss = 1.4.3
borg.localrole = 2.0.1
five.customerize = 0.3
-five.localsitemanager = 1.1
+five.localsitemanager = 1.3
kss.core = 1.4.9
-plone.app.content = 1.6
+plone.app.content = 1.8
plone.app.contentmenu = 1.1.7
-plone.app.contentrules = 1.1.6
+plone.app.contentrules = 1.1.7
plone.app.controlpanel = 1.3
-plone.app.customerize = 1.1.3
-plone.app.form = 1.1.7
-plone.app.i18n = 1.0.7
-plone.app.iterate = 1.2.3
+plone.app.customerize = 1.1.4
+plone.app.form = 1.1.9
+plone.app.i18n = 1.0.8
+plone.app.iterate = 1.2.5
plone.app.kss = 1.4.5
-plone.app.layout = 1.2.6
+plone.app.layout = 1.2.7
plone.app.linkintegrity = 1.0.12
-plone.app.locales = 3.3.9
-plone.app.openid = 1.1
+plone.app.locales = 3.3.15
+plone.app.openid = 1.1.1
plone.app.portlets = 1.2.1
-plone.app.redirector = 1.0.12
+plone.app.redirector = 1.1
plone.app.viewletmanager = 1.2.2
-plone.app.vocabularies = 1.0.6
+plone.app.vocabularies = 1.0.8
plone.app.workflow = 1.2
plone.browserlayer = 1.0.1
plone.contentrules = 1.1.0
plone.fieldsets = 1.0.3
-plone.i18n = 1.0.8
-plone.indexer = 1.0rc2
+plone.i18n = 1.0.10
+plone.indexer = 1.0
plone.intelligenttext = 1.0.3
plone.keyring = 1.2
-plone.locking = 1.2.0
+plone.locking = 1.2.1
plone.memoize = 1.0.4
plone.openid = 1.2
plone.portlet.collection = 1.1.3
-plone.portlet.static = 1.2rc1
+plone.portlet.static = 1.2.1
plone.portlets = 1.2
plone.protect = 1.1
plone.session = 2.1
plone.theme = 1.2
wicked = 1.1.7
-z3c.autoinclude = 0.3.1
+z3c.autoinclude = 0.3.3
+
Oops, something went wrong.

0 comments on commit c709e29

Please sign in to comment.