zc.recipe.testrunner

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

  1. support-system-python
  2. Merge into trunk
Proposed by Gary Poster
Status: Needs review
Proposed branch: lp://staging/~gary/zc.recipe.testrunner/support-system-python
Merge into: lp://staging/~gary/zc.recipe.testrunner/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~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.staging.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
=== modified file 'CHANGES.txt'
--- CHANGES.txt 2009-03-23 17:11:02 +0000
+++ CHANGES.txt 2009-07-11 19:13:56 +0000
@@ -2,6 +2,12 @@
2Change History2Change History
3**************3**************
44
51.3.0 (unreleased)
6==================
7
8- Add support for zc.buildout 1.4.0, specifically the changes to handling
9 site-packages in script paths.
10
51.2.0 (2009-03-23)111.2.0 (2009-03-23)
6==================12==================
713
814
=== 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 @@
1[buildout]1[buildout]
2parts = test2parts = test
3develop = .3develop = .
4 zc.buildout
5 zc.buildout/zc.recipe.egg_
46
5[test]7[test]
6recipe = zc.recipe.testrunner8recipe = zc.recipe.testrunner
79
=== modified file 'setup.py'
--- setup.py 2009-03-28 14:10:32 +0000
+++ setup.py 2009-07-09 18:52:45 +0000
@@ -29,10 +29,10 @@
29 include_package_data = True,29 include_package_data = True,
30 package_dir = {'':'src'},30 package_dir = {'':'src'},
31 namespace_packages = ['zc', 'zc.recipe'],31 namespace_packages = ['zc', 'zc.recipe'],
32 install_requires = ['zc.buildout >=1.2.0',32 install_requires = ['zc.buildout >=1.4.0dev',
33 'zope.testing >=3.6.0',33 'zope.testing >=3.6.0',
34 'setuptools',34 'setuptools',
35 'zc.recipe.egg >=1.2.0',35 'zc.recipe.egg >=1.3.0dev',
36 ],36 ],
37 test_suite = name+'.tests.test_suite',37 test_suite = name+'.tests.test_suite',
38 entry_points = {'zc.buildout': ['default = %s:TestRunner' % name]},38 entry_points = {'zc.buildout': ['default = %s:TestRunner' % name]},
3939
=== modified file 'src/zc/recipe/testrunner/README.txt'
--- src/zc/recipe/testrunner/README.txt 2009-03-19 19:43:01 +0000
+++ src/zc/recipe/testrunner/README.txt 2009-07-09 18:52:45 +0000
@@ -235,17 +235,18 @@
235235
236 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),236 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
237237
238 >>> cat(sample_buildout, 'bin', 'testdemo')238 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
239 #!/usr/local/bin/python2.4239 #!/usr/local/bin/python2.4
240 <BLANKLINE>240 <BLANKLINE>
241 import sys241 import sys
242 sys.path[0:0] = [242 sys.path[:] = [
243 '/sample-buildout/demo',243 '/sample-buildout/demo',
244 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',244 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
245 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',245 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
246 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',246 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
247 '/usr/local/zope/lib/python',247 '/usr/local/zope/lib/python',
248 ]248 ...
249 ]
249 <BLANKLINE>250 <BLANKLINE>
250 import os251 import os
251 sys.argv[0] = os.path.abspath(sys.argv[0])252 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -278,17 +279,18 @@
278279
279 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),280 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
280281
281 >>> cat(sample_buildout, 'bin', 'testdemo')282 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
282 #!/usr/local/bin/python2.4283 #!/usr/local/bin/python2.4
283 <BLANKLINE>284 <BLANKLINE>
284 import sys285 import sys
285 sys.path[0:0] = [286 sys.path[:] = [
286 '/sample-buildout/demo',287 '/sample-buildout/demo',
287 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',288 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
288 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',289 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
289 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',290 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
290 '/usr/local/zope/lib/python',291 '/usr/local/zope/lib/python',
291 ]292 ...
293 ]
292 <BLANKLINE>294 <BLANKLINE>
293 import os295 import os
294 sys.argv[0] = os.path.abspath(sys.argv[0])296 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -333,17 +335,18 @@
333335
334 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),336 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
335337
336 >>> cat(sample_buildout, 'bin', 'testdemo')338 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
337 #!/usr/local/bin/python2.4339 #!/usr/local/bin/python2.4
338 <BLANKLINE>340 <BLANKLINE>
339 import sys341 import sys
340 sys.path[0:0] = [342 sys.path[:] = [
341 '/sample-buildout/demo',343 '/sample-buildout/demo',
342 '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',344 '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
343 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',345 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
344 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',346 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
345 '/usr/local/zope/lib/python',347 '/usr/local/zope/lib/python',
346 ]348 ...
349 ]
347 <BLANKLINE>350 <BLANKLINE>
348 import os351 import os
349 sys.argv[0] = os.path.abspath(sys.argv[0])352 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -395,7 +398,6 @@
395 Failure in test test (demo.tests.DemoTests)398 Failure in test test (demo.tests.DemoTests)
396 Traceback (most recent call last):399 Traceback (most recent call last):
397 ...400 ...
398 raise self.failureException, \
399 AssertionError: '42' != '23'401 AssertionError: '42' != '23'
400 <BLANKLINE>402 <BLANKLINE>
401 <BLANKLINE>403 <BLANKLINE>
@@ -431,16 +433,17 @@
431433
432 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),434 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
433435
434 >>> cat(sample_buildout, 'bin', 'testdemo')436 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
435 #!/usr/local/bin/python2.4437 #!/usr/local/bin/python2.4
436 <BLANKLINE>438 <BLANKLINE>
437 import sys439 import sys
438 sys.path[0:0] = [440 sys.path[:] = [
439 '/sample-buildout/demo',441 '/sample-buildout/demo',
440 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',442 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
441 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',443 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
442 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',444 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
443 ]445 ...
446 ]
444 <BLANKLINE>447 <BLANKLINE>
445 import os448 import os
446 sys.argv[0] = os.path.abspath(sys.argv[0])449 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -487,17 +490,18 @@
487490
488 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),491 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
489492
490 >>> cat(sample_buildout, 'bin', 'testdemo')493 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
491 #!/usr/local/bin/python2.4494 #!/usr/local/bin/python2.4
492 <BLANKLINE>495 <BLANKLINE>
493 import sys496 import sys
494 sys.path[0:0] = [497 sys.path[:] = [
495 '/sample-buildout/demo',498 '/sample-buildout/demo',
496 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',499 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
497 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',500 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
498 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',501 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
499 '/usr/local/zope/lib/python',502 '/usr/local/zope/lib/python',
500 ]503 ...
504 ]
501 <BLANKLINE>505 <BLANKLINE>
502 import os506 import os
503 sys.argv[0] = os.path.abspath(sys.argv[0])507 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -535,17 +539,18 @@
535539
536 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),540 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
537541
538 >>> cat(sample_buildout, 'bin', 'testdemo')542 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
539 #!/usr/local/bin/python2.4543 #!/usr/local/bin/python2.4
540 <BLANKLINE>544 <BLANKLINE>
541 import sys545 import sys
542 sys.path[0:0] = [546 sys.path[:] = [
543 '/sample-buildout/demo',547 '/sample-buildout/demo',
544 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',548 '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
545 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',549 '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
546 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',550 '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
547 '/usr/local/zope/lib/python',551 '/usr/local/zope/lib/python',
548 ]552 ...
553 ]
549 <BLANKLINE>554 <BLANKLINE>
550 import os555 import os
551 sys.argv[0] = os.path.abspath(sys.argv[0])556 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -582,24 +587,25 @@
582587
583 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),588 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
584589
585 >>> cat(sample_buildout, 'bin', 'testdemo')590 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
586 #!/usr/local/bin/python2.4591 #!/usr/local/bin/python2.4
587 <BLANKLINE>592 <BLANKLINE>
588 import os593 import os
589 <BLANKLINE>594 <BLANKLINE>
590 join = os.path.join595 join = os.path.join
591 base = os.path.dirname(__file__)596 base = os.path.dirname(os.path.abspath(__file__))
592 base = os.path.dirname(base)597 base = os.path.dirname(base)
593 <BLANKLINE>598 <BLANKLINE>
594 import sys599 import sys
595 sys.path[0:0] = [600 sys.path[:] = [
596 join(base, 'demo'),601 join(base, 'demo'),
597 join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),602 join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
598 join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),603 join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
599 join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),604 join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
600 '/usr/local/zope/lib/python',605 '/usr/local/zope/lib/python',
601 join(base, 'sources'),606 join(base, 'sources'),
602 ]607 ...
608 ]
603 <BLANKLINE>609 <BLANKLINE>
604 import os610 import os
605 sys.argv[0] = os.path.abspath(sys.argv[0])611 sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -632,24 +638,25 @@
632638
633 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),639 >>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
634640
635 >>> cat(sample_buildout, 'bin', 'testdemo')641 >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
636 #!/usr/local/bin/python2.4642 #!/usr/local/bin/python2.4
637 <BLANKLINE>643 <BLANKLINE>
638 import os644 import os
639 <BLANKLINE>645 <BLANKLINE>
640 join = os.path.join646 join = os.path.join
641 base = os.path.dirname(__file__)647 base = os.path.dirname(os.path.abspath(__file__))
642 base = os.path.dirname(base)648 base = os.path.dirname(base)
643 <BLANKLINE>649 <BLANKLINE>
644 import sys650 import sys
645 sys.path[0:0] = [651 sys.path[:] = [
646 join(base, 'demo'),652 join(base, 'demo'),
647 join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),653 join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
648 join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),654 join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
649 join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),655 join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
650 '/usr/local/zope/lib/python',656 '/usr/local/zope/lib/python',
651 join(base, 'sources'),657 join(base, 'sources'),
652 ]658 ...
659 ]
653 <BLANKLINE>660 <BLANKLINE>
654 import os661 import os
655 sys.argv[0] = os.path.abspath(sys.argv[0])662 sys.argv[0] = os.path.abspath(sys.argv[0])
656663
=== modified file 'src/zc/recipe/testrunner/__init__.py'
--- src/zc/recipe/testrunner/__init__.py 2009-03-19 19:43:01 +0000
+++ src/zc/recipe/testrunner/__init__.py 2009-07-09 18:52:45 +0000
@@ -37,6 +37,14 @@
37 buildout['buildout']['parts-directory'], name)37 buildout['buildout']['parts-directory'], name)
38 self.egg = zc.recipe.egg.Egg(buildout, name, options)38 self.egg = zc.recipe.egg.Egg(buildout, name, options)
3939
40 include_site_packages = self.options.setdefault(
41 'include-site-packages',
42 self.buildout['buildout'].get('include-site-packages', 'true'))
43 if include_site_packages not in ('true', 'false'):
44 self._error('Invalid value for include-site-packages option: %s',
45 include_site_packages)
46 self.include_site_packages = (include_site_packages=='true')
47
40 def install(self):48 def install(self):
41 options = self.options49 options = self.options
42 dest = []50 dest = []
@@ -90,6 +98,7 @@
90 for p in test_paths)98 for p in test_paths)
91 +' ]'),99 +' ]'),
92 initialization = initialization,100 initialization = initialization,
101 include_site_packages=self.include_site_packages,
93 relative_paths = self.egg._relative_paths,102 relative_paths = self.egg._relative_paths,
94 ))103 ))
95104

Subscribers

People subscribed via source and target branches

to all changes: