Merge lp://staging/~gary/launchpad/sitepackages-ng-1 into lp://staging/launchpad

Proposed by Gary Poster
Status: Merged
Approved by: Francis J. Lacoste
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~gary/launchpad/sitepackages-ng-1
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/launchpad/sitepackages-ng-1
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+9703@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

I have not included the eggs for this branch in the download-cache branch, pending the re-review of my zc.buildout branch (see my last comment on this merge proposal https://code.edge.launchpad.net/~gary/zc.buildout/support-system-python/+merge/8614).

This branch mostly just uses the new zc.buildout branch (and its friends).

This addresses bug 407408, because it specifies that we don't want to use any system-installed eggs. I actually used the new feature of ``bin/buildout -v`` to see what eggs I was using from the system. I was using several, but they were all provided in the download-cache branch so I simply specified that I no longer wanted to use any of them, and it worked fine. In addition to solving bug 407408, this should generally bring more consistency to our setups. (We are still using site-packages because that gives us packages like lxml, even though they are not provided by eggs. If the system ever provides these as eggs, and we want to use them, we should modify the ``allowed-eggs-from-site-packages`` value to let them through.)

This also adds the new include-site-packages-for-buildout feature. It defaults to false right now, which is what we need for bin/buildout to work on semi-broken system Pythons, so buildout.cfg does not have to specify anything. (This is why I was able to remove the include-site-packages settings.)

It also reinstates the ``allow-picked-versions = false`` setting, because I realized if I just matched up the cases of ipython then it would work. This revealed that we had not specified versions for zope.tales and uuid. I fixed that as well.

Revision history for this message
Francis J. Lacoste (flacoste) wrote :

On August 5, 2009, Gary Poster wrote:
> Gary Poster has proposed merging lp:~gary/launchpad/sitepackages-ng-1 into
> lp:launchpad/devel.
>
> Requested reviews:
> Francis J. Lacoste (flacoste)
>
> I have not included the eggs for this branch in the download-cache branch,
> pending the re-review of my zc.buildout branch (see my last comment on this
> merge proposal
> https://code.edge.launchpad.net/~gary/zc.buildout/support-system-python/+me
>rge/8614).
>
> This branch mostly just uses the new zc.buildout branch (and its friends).
>
> This addresses bug 407408, because it specifies that we don't want to use
> any system-installed eggs. I actually used the new feature of
> ``bin/buildout -v`` to see what eggs I was using from the system. I was
> using several, but they were all provided in the download-cache branch so I
> simply specified that I no longer wanted to use any of them, and it worked
> fine. In addition to solving bug 407408, this should generally bring more
> consistency to our setups. (We are still using site-packages because that
> gives us packages like lxml, even though they are not provided by eggs. If
> the system ever provides these as eggs, and we want to use them, we should
> modify the ``allowed-eggs-from-site-packages`` value to let them through.)
>
> This also adds the new include-site-packages-for-buildout feature. It
> defaults to false right now, which is what we need for bin/buildout to work
> on semi-broken system Pythons, so buildout.cfg does not have to specify
> anything. (This is why I was able to remove the include-site-packages
> settings.)
>
> It also reinstates the ``allow-picked-versions = false`` setting, because I
> realized if I just matched up the cases of ipython then it would work.
> This revealed that we had not specified versions for zope.tales and uuid.
> I fixed that as well.

This looks good. I still need to look at your other changes on zc.buildout
itself.

Thanks a lot

  status approved
  review approve

--
Francis J. Lacoste
<email address hidden>

review: Approve
Revision history for this message
Gary Poster (gary) wrote :

Thank you Francis!

If you don't mind, I'm going to throw this into the branch too: it puts versions.cfg back in alphabetical order (which will help with merges into the zbuildout branch, and is generally nicer). Is that ok with you too?

https://pastebin.canonical.com/20822/

Gary

Revision history for this message
Francis J. Lacoste (flacoste) wrote :

On August 5, 2009, Gary Poster wrote:
> Thank you Francis!
>
> If you don't mind, I'm going to throw this into the branch too: it puts
> versions.cfg back in alphabetical order (which will help with merges into
> the zbuildout branch, and is generally nicer). Is that ok with you too?
>
> https://pastebin.canonical.com/20822/
>
Sure, I don't mind.

--
Francis J. Lacoste
<email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2009-07-31 21:02:53 +0000
3+++ buildout.cfg 2009-08-05 03:30:57 +0000
4@@ -23,10 +23,12 @@
5 # to versions.cfg.
6 extends = versions.cfg
7
8-# allow-picked-versions = false # A buildout bug is not allowing this to work.
9+allow-picked-versions = false
10+
11+allowed-eggs-from-site-packages =
12+include-site-packages-for-buildout = false
13
14 prefer-final = true
15-include-site-packages = false
16
17 develop = .
18
19@@ -41,7 +43,6 @@
20 # Make mailman built and installed in a more normal way.
21 extra-paths = ${buildout:directory}/lib/mailman
22 source-directory = buildout-templates
23-include-site-packages = true
24
25 [scripts]
26 recipe = zc.recipe.egg
27@@ -59,24 +60,21 @@
28 googletestservice=canonical.launchpad.testing.googletestservice:main
29 windmill=windmill.bin.windmill_bin:main
30 lp-windmill=lp.scripts.utilities.lpwindmill:main
31-include-site-packages = true
32
33 [iharness]
34 recipe = zc.recipe.egg
35 eggs = lp
36- IPython
37+ ipython
38 extra-paths = ${buildout:directory}/lib/mailman
39 initialization = import os
40 os.environ['STORM_CEXTENSIONS'] = '1'
41 os.environ['LPCONFIG'] = '${configuration:instance_name}'
42 entry-points = iharness=canonical.database.harness:ipython
43 scripts = iharness ipython=ipy
44-include-site-packages = true
45
46 [tags]
47 recipe = z3c.recipe.tag:tags
48 eggs = lp
49-include-site-packages = true
50
51 [i18n]
52 recipe = z3c.recipe.i18n:i18n
53@@ -85,4 +83,3 @@
54 domain = launchpad
55 output = locales
56 zcml = <include file="../../site.zcml" />
57-include-site-packages = true
58
59=== modified file 'versions.cfg'
60--- versions.cfg 2009-08-03 08:06:13 +0000
61+++ versions.cfg 2009-08-05 14:36:18 +0000
62@@ -27,18 +27,19 @@
63 simplesettings = 0.4
64 SimpleTal = 4.1
65 storm = 0.14trunk-321
66+uuid = 1.30
67 wadllib = 0.1
68 webunit = 1.3.8
69 windmill = 1.2
70 wsgi-fileserver = 0.2.7
71 wsgi-jsonrpc = 0.2.8
72 wsgi-xmlrpc = 0.2.7
73-z3c.recipe.filetemplate = 2.1dev-gary-r101903
74+z3c.recipe.filetemplate = 2.1dev-gary-r102489
75 z3c.recipe.i18n = 0.5.3
76 z3c.recipe.tag = 0.2.0
77-zc.buildout = 1.4.0dev-gary-r101953
78+zc.buildout = 1.4.0dev-gary-r102499
79 zc.lockfile = 1.0.0
80-zc.recipe.egg = 1.3.0dev-gary-r101773
81+zc.recipe.egg = 1.3.0dev-gary-r102487
82 ZConfig = 2.6.1
83 zope.app.locales = 3.5.1
84 zope.configuration = 3.6.0
85@@ -61,6 +62,7 @@
86 zope.publisher = 3.5.6
87 zope.security = 3.6.0
88 zope.tal = 3.4.0
89+zope.tales = 3.4.0
90 zope.traversing = 3.5.2
91 zc.recipe.testrunner = 1.1.0
92