zc.recipe.testrunner

Merge lp:~gary/zc.recipe.testrunner/support-system-python into lp:~gary/zc.recipe.testrunner/trunk

  1. support-system-python
  2. Merge into trunk
Proposed by Gary Poster
Status: Needs review
Proposed branch: lp:~gary/zc.recipe.testrunner/support-system-python
Merge into: lp:~gary/zc.recipe.testrunner/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~gary/zc.recipe.testrunner/support-system-python
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Jim Fulton Pending
Review via email: mp+8686@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Support the new zc.buildout 1.4.0+ include-site-packages option.

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

On July 13, 2009, Gary Poster wrote:
> Gary Poster has proposed merging
> lp:~gary/zc.recipe.testrunner/support-system-python into
> lp:~gary/zc.recipe.testrunner/trunk.
>
> Requested reviews:
> Francis J. Lacoste (flacoste)
>
> Support the new zc.buildout 1.4.0+ include-site-packages option.

Apart this question:

> === modified file 'buildout.cfg'
> --- buildout.cfg 2007-01-24 15:58:29 +0000
> +++ buildout.cfg 2009-07-09 18:52:45 +0000
> @@ -1,6 +1,8 @@
> [buildout]
> parts = test
> develop = .
> + zc.buildout
> + zc.buildout/zc.recipe.egg_

Is this a change you want to commit? Is it usual to use zc.buildout as a
develop egg?

It looks good.

  review approve

--
Francis J. Lacoste
<email address hidden>

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

On Jul 13, 2009, at 5:33 PM, Francis J. Lacoste wrote:

> Review: Approve
> On July 13, 2009, Gary Poster wrote:
>> Gary Poster has proposed merging
>> lp:~gary/zc.recipe.testrunner/support-system-python into
>> lp:~gary/zc.recipe.testrunner/trunk.
>>
>> Requested reviews:
>> Francis J. Lacoste (flacoste)
>>
>> Support the new zc.buildout 1.4.0+ include-site-packages option.
>
> Apart this question:
>
>> === modified file 'buildout.cfg'
>> --- buildout.cfg 2007-01-24 15:58:29 +0000
>> +++ buildout.cfg 2009-07-09 18:52:45 +0000
>> @@ -1,6 +1,8 @@
>> [buildout]
>> parts = test
>> develop = .
>> + zc.buildout
>> + zc.buildout/zc.recipe.egg_
>
> Is this a change you want to commit? Is it usual to use zc.buildout
> as a
> develop egg?
>
> It looks good.

No, sorry I should have called that out. This is what I do during
development. Once there are releases for these dependencies, I'll
take out this clause before I merge. The same goes with zc.recipe.egg
and z3c.recipe.filetemplate.

Thanks

Gary

Reply

Unmerged revisions

64. By Gary Poster

add CHANGES

63. By gary

basic updates to get tests to pass, and to honor new setting.

62. By gary

branch to support coordinating with zc.buildout changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGES.txt'
2--- CHANGES.txt 2009-03-23 17:11:02 +0000
3+++ CHANGES.txt 2009-07-11 19:13:56 +0000
4@@ -2,6 +2,12 @@
5 Change History
6 **************
7
8+1.3.0 (unreleased)
9+==================
10+
11+- Add support for zc.buildout 1.4.0, specifically the changes to handling
12+ site-packages in script paths.
13+
14 1.2.0 (2009-03-23)
15 ==================
16
17
18=== modified file 'buildout.cfg'
19--- buildout.cfg 2007-01-24 15:58:29 +0000
20+++ buildout.cfg 2009-07-09 18:52:45 +0000
21@@ -1,6 +1,8 @@
22 [buildout]
23 parts = test
24 develop = .
25+ zc.buildout
26+ zc.buildout/zc.recipe.egg_
27
28 [test]
29 recipe = zc.recipe.testrunner
30
31=== modified file 'setup.py'
32--- setup.py 2009-03-28 14:10:32 +0000
33+++ setup.py 2009-07-09 18:52:45 +0000
34@@ -29,10 +29,10 @@
35 include_package_data = True,
36 package_dir = {'':'src'},
37 namespace_packages = ['zc', 'zc.recipe'],
38- install_requires = ['zc.buildout >=1.2.0',
39+ install_requires = ['zc.buildout >=1.4.0dev',
40 'zope.testing >=3.6.0',
41 'setuptools',
42- 'zc.recipe.egg >=1.2.0',
43+ 'zc.recipe.egg >=1.3.0dev',
44 ],
45 test_suite = name+'.tests.test_suite',
46 entry_points = {'zc.buildout': ['default = %s:TestRunner' % name]},
47
48=== modified file 'src/zc/recipe/testrunner/README.txt'
49--- src/zc/recipe/testrunner/README.txt 2009-03-19 19:43:01 +0000
50+++ src/zc/recipe/testrunner/README.txt 2009-07-09 18:52:45 +0000
51@@ -235,17 +235,18 @@
52
53 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
54
55- >>> cat(sample_buildout, 'bin', 'testdemo')
56+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
57 #!/usr/local/bin/python2.4
58 <BLANKLINE>
59 import sys
60- sys.path[0:0] = [
61- '/sample-buildout/demo',
62- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
63- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
64- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
65- '/usr/local/zope/lib/python',
66- ]
67+ sys.path[:] = [
68+ '/sample-buildout/demo',
69+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
70+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
71+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
72+ '/usr/local/zope/lib/python',
73+ ...
74+ ]
75 <BLANKLINE>
76 import os
77 sys.argv[0] = os.path.abspath(sys.argv[0])
78@@ -278,17 +279,18 @@
79
80 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
81
82- >>> cat(sample_buildout, 'bin', 'testdemo')
83+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
84 #!/usr/local/bin/python2.4
85 <BLANKLINE>
86 import sys
87- sys.path[0:0] = [
88- '/sample-buildout/demo',
89- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
90- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
91- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
92- '/usr/local/zope/lib/python',
93- ]
94+ sys.path[:] = [
95+ '/sample-buildout/demo',
96+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
97+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
98+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
99+ '/usr/local/zope/lib/python',
100+ ...
101+ ]
102 <BLANKLINE>
103 import os
104 sys.argv[0] = os.path.abspath(sys.argv[0])
105@@ -333,17 +335,18 @@
106
107 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
108
109- >>> cat(sample_buildout, 'bin', 'testdemo')
110+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
111 #!/usr/local/bin/python2.4
112 <BLANKLINE>
113 import sys
114- sys.path[0:0] = [
115- '/sample-buildout/demo',
116- '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
117- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
118- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
119- '/usr/local/zope/lib/python',
120- ]
121+ sys.path[:] = [
122+ '/sample-buildout/demo',
123+ '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
124+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
125+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
126+ '/usr/local/zope/lib/python',
127+ ...
128+ ]
129 <BLANKLINE>
130 import os
131 sys.argv[0] = os.path.abspath(sys.argv[0])
132@@ -395,7 +398,6 @@
133 Failure in test test (demo.tests.DemoTests)
134 Traceback (most recent call last):
135 ...
136- raise self.failureException, \
137 AssertionError: '42' != '23'
138 <BLANKLINE>
139 <BLANKLINE>
140@@ -431,16 +433,17 @@
141
142 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
143
144- >>> cat(sample_buildout, 'bin', 'testdemo')
145+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
146 #!/usr/local/bin/python2.4
147 <BLANKLINE>
148 import sys
149- sys.path[0:0] = [
150- '/sample-buildout/demo',
151- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
152- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
153- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
154- ]
155+ sys.path[:] = [
156+ '/sample-buildout/demo',
157+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
158+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
159+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
160+ ...
161+ ]
162 <BLANKLINE>
163 import os
164 sys.argv[0] = os.path.abspath(sys.argv[0])
165@@ -487,17 +490,18 @@
166
167 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
168
169- >>> cat(sample_buildout, 'bin', 'testdemo')
170+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
171 #!/usr/local/bin/python2.4
172 <BLANKLINE>
173 import sys
174- sys.path[0:0] = [
175- '/sample-buildout/demo',
176- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
177- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
178- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
179- '/usr/local/zope/lib/python',
180- ]
181+ sys.path[:] = [
182+ '/sample-buildout/demo',
183+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
184+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
185+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
186+ '/usr/local/zope/lib/python',
187+ ...
188+ ]
189 <BLANKLINE>
190 import os
191 sys.argv[0] = os.path.abspath(sys.argv[0])
192@@ -535,17 +539,18 @@
193
194 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
195
196- >>> cat(sample_buildout, 'bin', 'testdemo')
197+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
198 #!/usr/local/bin/python2.4
199 <BLANKLINE>
200 import sys
201- sys.path[0:0] = [
202- '/sample-buildout/demo',
203- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
204- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
205- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
206- '/usr/local/zope/lib/python',
207- ]
208+ sys.path[:] = [
209+ '/sample-buildout/demo',
210+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
211+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
212+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
213+ '/usr/local/zope/lib/python',
214+ ...
215+ ]
216 <BLANKLINE>
217 import os
218 sys.argv[0] = os.path.abspath(sys.argv[0])
219@@ -582,24 +587,25 @@
220
221 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
222
223- >>> cat(sample_buildout, 'bin', 'testdemo')
224+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
225 #!/usr/local/bin/python2.4
226 <BLANKLINE>
227 import os
228 <BLANKLINE>
229 join = os.path.join
230- base = os.path.dirname(__file__)
231+ base = os.path.dirname(os.path.abspath(__file__))
232 base = os.path.dirname(base)
233 <BLANKLINE>
234 import sys
235- sys.path[0:0] = [
236- join(base, 'demo'),
237- join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
238- join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
239- join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
240- '/usr/local/zope/lib/python',
241- join(base, 'sources'),
242- ]
243+ sys.path[:] = [
244+ join(base, 'demo'),
245+ join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
246+ join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
247+ join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
248+ '/usr/local/zope/lib/python',
249+ join(base, 'sources'),
250+ ...
251+ ]
252 <BLANKLINE>
253 import os
254 sys.argv[0] = os.path.abspath(sys.argv[0])
255@@ -632,24 +638,25 @@
256
257 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
258
259- >>> cat(sample_buildout, 'bin', 'testdemo')
260+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
261 #!/usr/local/bin/python2.4
262 <BLANKLINE>
263 import os
264 <BLANKLINE>
265 join = os.path.join
266- base = os.path.dirname(__file__)
267+ base = os.path.dirname(os.path.abspath(__file__))
268 base = os.path.dirname(base)
269 <BLANKLINE>
270 import sys
271- sys.path[0:0] = [
272- join(base, 'demo'),
273- join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
274- join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
275- join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
276- '/usr/local/zope/lib/python',
277- join(base, 'sources'),
278- ]
279+ sys.path[:] = [
280+ join(base, 'demo'),
281+ join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
282+ join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
283+ join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
284+ '/usr/local/zope/lib/python',
285+ join(base, 'sources'),
286+ ...
287+ ]
288 <BLANKLINE>
289 import os
290 sys.argv[0] = os.path.abspath(sys.argv[0])
291
292=== modified file 'src/zc/recipe/testrunner/__init__.py'
293--- src/zc/recipe/testrunner/__init__.py 2009-03-19 19:43:01 +0000
294+++ src/zc/recipe/testrunner/__init__.py 2009-07-09 18:52:45 +0000
295@@ -37,6 +37,14 @@
296 buildout['buildout']['parts-directory'], name)
297 self.egg = zc.recipe.egg.Egg(buildout, name, options)
298
299+ include_site_packages = self.options.setdefault(
300+ 'include-site-packages',
301+ self.buildout['buildout'].get('include-site-packages', 'true'))
302+ if include_site_packages not in ('true', 'false'):
303+ self._error('Invalid value for include-site-packages option: %s',
304+ include_site_packages)
305+ self.include_site_packages = (include_site_packages=='true')
306+
307 def install(self):
308 options = self.options
309 dest = []
310@@ -90,6 +98,7 @@
311 for p in test_paths)
312 +' ]'),
313 initialization = initialization,
314+ include_site_packages=self.include_site_packages,
315 relative_paths = self.egg._relative_paths,
316 ))
317

Subscribers

People subscribed via source and target branches

to all changes: