Merge lp:~abentley/launchpad/recipe-index into lp:launchpad

[Aaron Bentley]

= Summary =
Provide an index page for recipes

== Proposed fix ==

== Pre-implementation notes ==
Mostly discussed with rockstar, some with thumper

== Implementation details ==
Because we do not want to provide an unfinished UI to Edge users, this page
is only enabled for the test runner and devel.

As well as a view for recipes, a view for builds was provided, so that we can
get user-facing information the view class.

It was determined, in discussion with Muharem, that the default of creating
builders with manual=True is not a sane default for test purposes. This has an
impact on ETA calculations, because manual builders are ignored in such
calculations. Therefore, I added the ability to control the manual flag in
IBuilderSet.new, and forced it to False in the factory method.

In consultation with Michael Hudson, I determined that
_SourcePackageRecipeData had several attributes that it would make sense to
view and manipulate directly. However, it needs to remain a separate class
because it is common to recipes and manifests. So I had SourcePackageRecipe
delegate to it.

There were miscellaneous lint fixes, like calling Storm.__init__ in subclasses.

I adjusted LaunchpadObjectFactory.makeDistroSeries to permit specifying a
displayname for distroseries. I adjusted makeSourcePackageRecipeBuildJob to
allow specifying a build. These changes helped me provide a consistent
homepage for tests.

== Tests ==
bin/test -v test_sourcepackagerecipe

== Demo and Q/A ==
Cannot be Q/A'ed until more pieces are in place.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/buildmaster/model/builder.py
  lib/lp/code/configure.zcml
  lib/lp/code/model/sourcepackagerecipedata.py
  configs/development/build-from-branch.zcml
  lib/lp/testing/factory.py
  lib/lp/code/templates/sourcepackagerecipe-index.pt
  lib/lp/registry/interfaces/person.py
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/lp/code/model/sourcepackagerecipe.py
  lib/lp/code/browser/tests/test_sourcepackagerecipe.py
  lib/lp/code/interfaces/sourcepackagerecipe.py
  lib/lp/registry/browser/person.py
  lib/lp/registry/model/person.py

== Pylint notices ==

lib/lp/code/model/sourcepackagerecipedata.py
    14: [F0401] Unable to import 'bzrlib.plugins.builder.recipe' (No module named builder)
    17: [F0401] Unable to import 'lazr.enum' (No module named enum)

lib/lp/testing/factory.py
    1710: [F0401, LaunchpadObjectFactory.makeRecipe] Unable to import 'bzrlib.plugins.builder.recipe' (No module named builder)

lib/lp/registry/interfaces/person.py
    523: [C0301] Line too long (80/78)
    53: [F0401] Unable to import 'lazr.enum' (No module named enum)
    54: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module named lifecycle)
    55: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    56: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
    63: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    410: [E1002, PersonNameField._validate] Use super on an old style class
    1414: [C0322, IPersonEditRestricted.addMember] Operator not preceded by a space
    status=copy_field(ITeamMembership['status']),
    ^
    comment=Text(required=False))
    @export_write_operation()
    def addMember(person, reviewer, status=TeamMembershipStatus.APPROVED,
    comment=None, force_team_add=False,
    may_subscribe_to_list=True):
    1455: [C0322, IPersonEditRestricted.acceptInvitationToBeMemberOf] Operator not preceded by a space
    comment=Text())
    ^
    @export_write_operation()
    def acceptInvitationToBeMemberOf(team, comment):
    1467: [C0322, IPersonEditRestricted.declineInvitationToBeMemberOf] Operator not preceded by a space
    comment=Text())
    ^
    @export_write_operation()
    def declineInvitationToBeMemberOf(team, comment):
    1765: [C0322, IPersonSet.newTeam] Operator not preceded by a space
    defaultmembershipperiod='default_membership_period',
    ^
    defaultrenewalperiod='default_renewal_period')
    @operation_parameters(
    subscriptionpolicy=Choice(
    title=_('Subscription policy'), vocabulary=TeamSubscriptionPolicy,
    required=False, default=TeamSubscriptionPolicy.MODERATED))
    @export_factory_operation(
    ITeam, ['name', 'displayname', 'teamdescription',
    'defaultmembershipperiod', 'defaultrenewalperiod'])
    def newTeam(teamowner, name, displayname, teamdescription=None,
    subscriptionpolicy=TeamSubscriptionPolicy.MODERATED,
    defaultmembershipperiod=None, defaultrenewalperiod=None):
    1834: [C0322, IPersonSet.findPerson] Operator not preceded by a space
    created_after=Datetime(
    ^
    title=_("Created after"), required=False),
    created_before=Datetime(
    title=_("Created before"), required=False),
    )
    @operation_returns_collection_of(IPerson)
    @export_read_operation()
    def findPerson(text="", exclude_inactive_accounts=True,
    must_have_email=False,
    created_after=None, created_before=None):

lib/lp/code/model/sourcepackagerecipe.py
    11: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

lib/lp/code/browser/tests/test_sourcepackagerecipe.py
    125: [C0301] Line too long (79/78)

lib/lp/code/interfaces/sourcepackagerecipe.py
    17: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)

lib/lp/registry/browser/person.py
    117: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    118: [F0401] Unable to import 'lazr.config' (No module named config)
    119: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    120: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)
    230: [F0401] Unable to import 'lazr.uri' (No module named uri)

[Aaron Bentley (abentley)]

Screenshot:
http://people.canonical.com/~abentley/recipe-index-review.png

[Guilherme Salgado (salgado)]

This looks good but I have a few questions/suggestions.

 review needsfixing

On Fri, 2010-03-19 at 14:53 +0000, Aaron Bentley wrote:
>
> = Summary =
> Provide an index page for recipes
>
> == Proposed fix ==
>
> == Pre-implementation notes ==
> Mostly discussed with rockstar, some with thumper
>
> == Implementation details ==
> Because we do not want to provide an unfinished UI to Edge users, this
> page
> is only enabled for the test runner and devel.
>
> As well as a view for recipes, a view for builds was provided, so that
> we can
> get user-facing information the view class.
>
> It was determined, in discussion with Muharem, that the default of
> creating
> builders with manual=True is not a sane default for test purposes.
> This has an
> impact on ETA calculations, because manual builders are ignored in
> such
> calculations. Therefore, I added the ability to control the manual
> flag in
> IBuilderSet.new, and forced it to False in the factory method.
>
> In consultation with Michael Hudson, I determined that
> _SourcePackageRecipeData had several attributes that it would make
> sense to
> view and manipulate directly. However, it needs to remain a separate
> class
> because it is common to recipes and manifests. So I had
> SourcePackageRecipe
> delegate to it.
>
> There were miscellaneous lint fixes, like calling Storm.__init__ in
> subclasses.
>
> I adjusted LaunchpadObjectFactory.makeDistroSeries to permit
> specifying a
> displayname for distroseries. I adjusted
> makeSourcePackageRecipeBuildJob to
> allow specifying a build. These changes helped me provide a
> consistent
> homepage for tests.
>
> == Tests ==
> bin/test -v test_sourcepackagerecipe
>
> == Demo and Q/A ==
> Cannot be Q/A'ed until more pieces are in place.
>

> === modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
> --- lib/lp/code/browser/sourcepackagerecipe.py 2010-03-12 18:53:55 +0000
> +++ lib/lp/code/browser/sourcepackagerecipe.py 2010-03-19 14:53:16 +0000
> @@ -6,3 +6,79 @@
> __metaclass__ = type
>
> __all__ = []
> +
> +
> +from canonical.launchpad.webapp import (
> + LaunchpadView)
> +from lp.buildmaster.interfaces.buildbase import BuildStatus
> +
> +
> +class SourcePackageRecipeView(LaunchpadView):
> + """Default view of a SourcePackageRecipe."""
> +
> + @property
> + def title(self):
> + return self.context.name
> +
> + label = title
> +
> + @property
> + def builds(self):
> + """A list of interesting builds.
> +
> + All pending builds are shown, as well as 1-5 recent builds.
> + Recent builds are ordered by date completed.
> + """
> + builds = list(self.context.getBuilds(pending=True))
> + for build in self.context.getBuilds():
> + builds.append(build)
> + if len(builds) >= 5:
> + break
> + builds.reverse()
> + return builds
> +
> +
> +class SourcePackageRecipeBuildView(LaunchpadView):
> + """Default view of a SourcePackageRecipeBuild."""
> +
> + @property
> + def status(self):
> + """A human-friendly status string."""
> + description = {
> + BuildStatus.NEEDSBUILD: 'Pending...

review: Needs Fixing

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Guilherme Salgado wrote:
>> + @property
>> + def status(self):
>> + """A human-friendly status string."""
>> + description = {
>> + BuildStatus.NEEDSBUILD: 'Pending build',
>> + BuildStatus.FULLYBUILT: 'Successful build',
>> + BuildStatus.FAILEDTOBUILD: 'Failed to build',
>> + BuildStatus.MANUALDEPWAIT:
>> + 'Could not build because of missing dependencies',
>> + BuildStatus.CHROOTWAIT:
>> + 'Could not build because of chroot issues',
>> + BuildStatus.SUPERSEDED:
>> + 'Could not build because source package was superseded',
>> + BuildStatus.BUILDING:
>> + 'Currently building',
>> + BuildStatus.FAILEDTOUPLOAD:
>> + 'Could not be uploaded correctly',
>
> Would it not make sense to have these strings as the title of the items
> in the BuildStatus enum?

That's Soyuz code, and I don't want to change it unnecessarily. I don't
know how the existing titles are used, and whether these strings would
make sense in that context.

>> === added file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
>> --- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 1970-01-01 00:00:00 +0000
>> +++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-03-19 14:53:16 +0000
>> +class TestSourcePackageRecipe(TestCaseWithFactory):
>
> Judging by the test class' name, I was expecting to see a test for
> SourcePackageRecipe, but in fact it's testing SPR's default view. How
> about renaming the test class to TestSourcePackageRecipeView?

Done.

>
>> +
>> + layer = DatabaseFunctionalLayer
>> +
>> + def makeRecipe(self):
>> + chef = self.factory.makePersonNoCommit(displayname='Master Chef',
>> + name='chef')
>> + chocolate = self.factory.makeProduct(name='chocolate')
>> + cake_branch = self.factory.makeProductBranch(owner=chef, name='cake',
>> + product=chocolate)
>
> Mind moving all arguments into the same line, in the calls to
> makeProductBranch and makePerson above? They should either be on a line
> by themselves or be aligned...

Done.

>> + def getMainText(self, recipe):
>> + browser = self.getUserBrowser(canonical_url(recipe))
>> + return extract_text(find_main_content(browser.contents))
>> +
>> + def test_index(self):
>> + recipe = self.makeRecipe()
>> + build = removeSecurityProxy(self.factory.makeSourcePackageRecipeBuild(
>> + recipe=recipe))
>> + build.buildstate = BuildStatus.FULLYBUILT
>> + build.datebuilt = datetime(2010, 03, 16, tzinfo=utc)
>> + pattern = re.compile(dedent("""\
>> + Master Chef
>> + Branches
>> + Description
>> + This recipe .*changes.
>> + Recipe Information
>> + Owner:
>> + Master Chef
>> + Base branch:
>> + lp://dev/~chef/chocolate/cake
>> + Debian version:
>> + 1.0
>> + Distros:
>> + Secret Squirrel
>> + Build reco...

[Paul Hummer (rockstar)]

I don't have any comments because we've been iterating over this for a week, making changes here and there. This is exactly as we have discussed over the last week.

review: Approve (ui*)

[Guilherme Salgado (salgado)]

On Mon, 2010-03-22 at 14:09 +0000, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Guilherme Salgado wrote:
> >> + @property
> >> + def status(self):
> >> + """A human-friendly status string."""
> >> + description = {
> >> + BuildStatus.NEEDSBUILD: 'Pending build',
> >> + BuildStatus.FULLYBUILT: 'Successful build',
> >> + BuildStatus.FAILEDTOBUILD: 'Failed to build',
> >> + BuildStatus.MANUALDEPWAIT:
> >> + 'Could not build because of missing dependencies',
> >> + BuildStatus.CHROOTWAIT:
> >> + 'Could not build because of chroot issues',
> >> + BuildStatus.SUPERSEDED:
> >> + 'Could not build because source package was superseded',
> >> + BuildStatus.BUILDING:
> >> + 'Currently building',
> >> + BuildStatus.FAILEDTOUPLOAD:
> >> + 'Could not be uploaded correctly',
> >
> > Would it not make sense to have these strings as the title of the items
> > in the BuildStatus enum?
>
> That's Soyuz code, and I don't want to change it unnecessarily. I don't
> know how the existing titles are used, and whether these strings would
> make sense in that context.
>

Being able to use the enum's titles both here and in soyuz code will
make for more consistent UI and avoid this extra code, so we all win.
Have you checked what the current title is for them? Maybe you could
use what's there already?

Julian, what do you think?

> >> === modified file 'lib/lp/code/model/sourcepackagerecipedata.py'
> >> --- lib/lp/code/model/sourcepackagerecipedata.py 2010-02-05 15:07:44 +0000
> >> +++ lib/lp/code/model/sourcepackagerecipedata.py 2010-03-19 14:53:16 +0000
> >> @@ -9,7 +9,7 @@
> >> """
> >>
> >> __metaclass__ = type
> >> -__all__ = ['_SourcePackageRecipeData']
> >> +__all__ = ['SourcePackageRecipeData']
> >
> > Why did you rename it?
>
> It has become part of the public API, no longer an implementation
> detail, because it manages data that is useful to address directly.
>

Ok.

> >> from bzrlib.plugins.builder.recipe import (
> >> BaseRecipeBranch, MergeInstruction, NestInstruction, RecipeBranch)
> >> @@ -50,6 +50,7 @@
> >>
> >> def __init__(self, name, type, comment, line_number, branch, revspec,
> >> directory, recipe_data, parent_instruction):
> >> + super( _SourcePackageRecipeDataInstruction, self).__init__()
> >
> > Is there a whitespace preceding the class name above?
>
> There was. Gone now.
>
> >> + <dl id="distros">
> >> + <dt>Distros:</dt>
> >
> > Is this really meant to be in the plural? Judging by the code below,
> > I'd expect to see a single distribution series here.
>
> Yes, it is meant to be in the plural. There is a database patch that is
> just waiting for Bjorn's review to change the relationship to a
> many-to-many:
> https://code.edge.launchpad.net/~abentley/launchpad/multiple-series-recipe/+merge/21257
>

Ok, cool.

> > Also, we shouldn't
> > be using 'Distros' in the UI, should we?
>
> Okay, so what should we be using?

Distributions, perha...

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Guilherme Salgado wrote:
> Being able to use the enum's titles both here and in soyuz code will
> make for more consistent UI and avoid this extra code, so we all win.
> Have you checked what the current title is for them? Maybe you could
> use what's there already?

I have looked at what's there, and it's not appropriate for us. That
suggests our text won't be appropriate in Soyuz contexts.

Also, we are attempting to land this without any impact on end-users.
Changing the enum titles would have an impact.

> Distributions, perhaps? I know we shouldn't use abbreviations in the
> UI, but maybe 'Distros' is an exception? The UI reviewer ought to know.

Okay.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkunuO0ACgkQ0F+nu1YWqI11fACfXQRXTz9oMdqEZReXFbW/7T4L
iUMAnjYRuLh1ZQQ4O0+gI1uGSYvoeLnc
=6O54
-----END PGP SIGNATURE-----

[Michael Nelson (michael.nelson)]

Hi Aaron and Paul,

This is looking great! First, sorry if I'm re-asking questions that may have already been discussed by you both. But as I don't know the history of the discussions, I'll ask them anyway.

To test this out in the UI, I've put a breakpoint at the end of test_index, and run a devserver using the testrunner config (it'd be great to include instructions like this when requesting a ui review).

The layout looks great - nice and clean. There are a few small things that popped into mind:

The first thing that stands out is that I need to include a %20 in the url to be able to traverse to the recipe... is that intentional? So the url I'm using is:

https://code.launchpad.dev/~chef/+recipe/Cake%20Recipe

Normally we have a human readable displayname, and name is normally cake_recipe, but perhaps you guys decided against this for good reason (we should slugify the displayname for the initial name right?). The mockup for recipe creation assumed it would be a slug: http://people.canonical.com/~michaeln/bfb/create_recipe_v2-collapsed.png

It's unfortunate that branch names are so long - it's the one thing that looks very squashed in your screenshot (looks fine locally with a wider browser of course), but I guess you always have to deal with that :) Is it possible to use a short name here?

Now I'm sure this *is* something you've discussed - but why isn't the traversal for a recipe (or recipes) off the base branch? (is it in case the base-branch is modified?). I'm just looking at the bread-crumbs and wondering whether it will be: "person >> branches >> recipes >> recipe_display_name", which seems a bit weird to me (ie. as opposed to "person >> branches >> branch_short_name >> recipes...").

Similar to Guilherme, I think "Distros" should be "Distribution series" (as it's the series to which you're linking). This is consistent with the product-packages.pt template. There are some cases where we simply use "Series" but that's only when the context is already a distribution.

On a related note: I also agree that we should not need to re-define the buildstate titles/descriptions (what's wrong with "Successfully built 7 minutes ago" in the UI?). I don't see why we can't define a good set of common titles and descriptions (that's why we moved BuildBase and BuildStatus to lp.buildmaster). The main issue seems to be that the current ones (BuildStatus) are still soyuz-specific and I guess changing them will blow this branch out (due to test failures). Can you create a bug and XXX here so that we don't forget. Another option you might consider (still with an XXX) is to augment the current ones here, rather than create a new set with some duplication? (eg. code_specific_descriptions.get(self.context.buildstate, self.context.buildstate.title) or similar). See what you think.

Again, something you've probably already discussed, but in the mockups we were planning on presenting the "Packaging branch" (just a merge statement with the name 'packaging') if one was defined for the recipe (optional, as an advanced recipe might specify multiple packaging related branches). Is it worth adding it to the "Recipe information" portlet? (which should actually be ...

review: Needs Information (ui)

[Julian Edwards (julian-edwards)]

On Monday 22 March 2010 18:12:40 Guilherme Salgado wrote:
> On Mon, 2010-03-22 at 14:09 +0000, Aaron Bentley wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Guilherme Salgado wrote:
> > >> + @property
> > >> + def status(self):
> > >> + """A human-friendly status string."""
> > >> + description = {
> > >> + BuildStatus.NEEDSBUILD: 'Pending build',
> > >> + BuildStatus.FULLYBUILT: 'Successful build',
> > >> + BuildStatus.FAILEDTOBUILD: 'Failed to build',
> > >> + BuildStatus.MANUALDEPWAIT:
> > >> + 'Could not build because of missing dependencies',
> > >> + BuildStatus.CHROOTWAIT:
> > >> + 'Could not build because of chroot issues',
> > >> + BuildStatus.SUPERSEDED:
> > >> + 'Could not build because source package was
> > >> superseded', + BuildStatus.BUILDING:
> > >> + 'Currently building',
> > >> + BuildStatus.FAILEDTOUPLOAD:
> > >> + 'Could not be uploaded correctly',
> > >
> > > Would it not make sense to have these strings as the title of the items
> > > in the BuildStatus enum?
> >
> > That's Soyuz code, and I don't want to change it unnecessarily. I don't
> > know how the existing titles are used, and whether these strings would
> > make sense in that context.
>
> Being able to use the enum's titles both here and in soyuz code will
> make for more consistent UI and avoid this extra code, so we all win.
> Have you checked what the current title is for them? Maybe you could
> use what's there already?
>
> Julian, what do you think?

I think that using the enum titles is absolutely the right thing to do.

There are some templates that use the existing titles (grep for
"buildstate/title"), so any changes should get a UI review to make sure they
still make sense, but I fully support anything that makes the UI more
readable!

> > >> + def getRecipe(name):
> > > I wonder if we shouldn't call this getSourcePackageRecipe(name)?
> > > Although it's a lot longer it doesn't leave one wondering what sort of
> > > recipe could a person have.
> >
> > IMO, SourcePackageRecipe is way too long, and the fewer places we use
> > it, the better. I think the confusion will be short-lived, and less
> > typing is a win.
>
> Ok

FWIW I think getSourcePackageRecipe is better. What if we introduce other
kinds of recipes in the future? And all editors I've used have auto-complete
:)

J

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Michael Nelson wrote:
> Normally we have a human readable displayname, and name is normally
> cake_recipe, but perhaps you guys decided against this for good
> reason (we should slugify the displayname for the initial name
> right?). The mockup for recipe creation assumed it would be a slug:
> http://people.canonical.com/~michaeln/bfb/create_recipe_v2-collapsed.png

The table does not provide a displayname, so I used the name. It was an
error to use "Cake Recipe" as the name. I should have used
"cake_recipe" or similar.

> It's unfortunate that branch names are so long - it's the one thing
> that looks very squashed in your screenshot (looks fine locally with
> a wider browser of course), but I guess you always have to deal with
> that :) Is it possible to use a short name here?

We use short names automatically when they are available, but most
branches don't have short names.

> Now I'm sure this *is* something you've discussed - but why isn't the
> traversal for a recipe (or recipes) off the base branch?

The canonical URL is already defined in stable/dbstable; it was not
introduced by this branch. Tim proposed the current URL and no one
disagreed, so it was documented in
https://dev.launchpad.net/BuildBranchToArchiveUI/InitialCut

As you note, branch names are long, which is a disadvantage.
Sourcepackagebranches have even longer names. It's also trivial to
change the base branch in a recipe, so varying the name according to the
base branch would make URLs volatile.

> Similar to Guilherme, I think "Distros" should be "Distribution
> series" (as it's the series to which you're linking). This is
> consistent with the product-packages.pt template. There are some
> cases where we simply use "Series" but that's only when the context
> is already a distribution.

Done

> On a related note: I also agree that we should not need to re-define
> the buildstate titles/descriptions (what's wrong with "Successfully
> built 7 minutes ago" in the UI?)

It's not the UI that I was tasked to implement:
http://people.canonical.com/~rockstar/RecipeView.png

>. I don't see why we can't define a
> good set of common titles and descriptions (that's why we moved
> BuildBase and BuildStatus to lp.buildmaster). The main issue seems to
> be that the current ones (BuildStatus) are still soyuz-specific and I
> guess changing them will blow this branch out (due to test failures).

I find the existing ones hard to understand. That's the biggest issue
from my point of view. But they also didn't match the grammar in the UI
mockup.

> Can you create a bug and XXX here so that we don't forget.

Per Julian, I have changed all the enums to match what Code needs.

> Again, something you've probably already discussed, but in the
> mockups we were planning on presenting the "Packaging branch"

We believe that's not required for the initial cut. We are going for
the simplest thing that could possibly work.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkuo1TAACgkQ0F+nu1YWqI24+QCfUT8AQewwkMkqOV8rbYaLIMch
ncoAnj4u3smwkzElVHGC3Jfa...

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Julian Edwards wrote:
> I think that using the enum titles is absolutely the right thing to do.

Okay, I have changed the enum titles.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkuo1bAACgkQ0F+nu1YWqI3aZwCdESwa/wgUV5x9T71HW8fNIIV2
hmwAni08pSXCzY8bhy1fyXabAA7CLmik
=w0Jz
-----END PGP SIGNATURE-----

[Guilherme Salgado (salgado)]

review: Approve

[Michael Nelson (michael.nelson)]

Thanks for filling me in on all the info Aaron.

On Tue, Mar 23, 2010 at 3:51 PM, Aaron Bentley <email address hidden> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Michael Nelson wrote:
>> Normally we have a human readable displayname, and name is normally
>> cake_recipe, but perhaps you guys decided against this for good
>> reason (we should slugify the displayname for the initial name
>> right?). The mockup for recipe creation assumed it would be a slug:
>> http://people.canonical.com/~michaeln/bfb/create_recipe_v2-collapsed.png
>
> The table does not provide a displayname, so I used the name.  It was an
> error to use "Cake Recipe" as the name.  I should have used
> "cake_recipe" or similar.

OK, so the create validation will need to enforce this I guess. Great.

>> Now I'm sure this *is* something you've discussed - but why isn't the
>> traversal for a recipe (or recipes) off the base branch?
>
> The canonical URL is already defined in stable/dbstable; it was not
> introduced by this branch.  Tim proposed the current URL and no one
> disagreed, so it was documented in
> https://dev.launchpad.net/BuildBranchToArchiveUI/InitialCut
>
> As you note, branch names are long, which is a disadvantage.
> Sourcepackagebranches have even longer names.  It's also trivial to
> change the base branch in a recipe, so varying the name according to the
> base branch would make URLs volatile.

I got to chat briefly with Tim and he had a few other points too, so
just for the record in case anyone else asks the same question (I'll
try to document this on the wiki as a FAQ or something):
{{{
08:43 < noodles775> The only reason I could think of (which Aaron also
highlighted) is that it would be fragile if the base branch changes
etc., but the original mockups didn't allow you to change the base
branch of a recipe.
08:43 < thumper> noodles775: and I picked something
08:44 < noodles775> thumper: no problem, as long as you guys have
thought about it.
08:44 < thumper> noodles775: but what about changing the name of a branch?
08:44 < thumper> noodles775: or changing the owner
08:44 < thumper> noodles775: both of those change the unique name of the branch
08:44 < thumper> noodles775: and since the branch is accessed through
the id, the recipe url would chnage
08:45 < thumper> noodles775: also ~user/+recipe/name is short
08:45 < noodles775> thumper: I see, whereas both of those things
wouldn't change the recipe url where it is currently? Great.
08:45 * thumper nods
}}}

>
>> On a related note: I also agree that we should not need to re-define
>> the buildstate titles/descriptions (what's wrong with "Successfully
>> built 7 minutes ago" in the UI?)
>
> It's not the UI that I was tasked to implement:
> http://people.canonical.com/~rockstar/RecipeView.png

Right, if Paul specifically chose "Successful build" because he
thought "Successfully built" was incorrect, then I think it's worth
updating the BuildStatus as you've done, to improve it.

>
>>. I don't see why we can't define a
>> good set of common titles and descriptions (that's why we moved
>> BuildBase and BuildStatus to lp.buildmaster). The main issue seems to
>> be that the current ones (BuildSta...

[Michael Nelson (michael.nelson)]

review: Approve (ui)

=== added file 'configs/development/build-from-branch.zcml'
--- configs/development/build-from-branch.zcml	1970-01-01 00:00:00 +0000
+++ configs/development/build-from-branch.zcml	2010-04-05 18:28:37 +0000
@@ -0,0 +1,36 @@
+<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+     GNU Affero General Public License version 3 (see the file LICENSE).
+-->
+
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
+    i18n_domain="launchpad">
+    <facet facet="branches">
+
+        <browser:defaultView
+            for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            name="+index"
+            layer="canonical.launchpad.layers.CodeLayer"/>
+        <browser:page
+            for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
+            class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
+            name="+index"
+            template="../../lib/lp/code/templates/sourcepackagerecipe-index.pt"
+            permission="zope.Public"/>
+    </facet>
+    <facet facet="branches">
+        <browser:defaultView
+            for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+            name="+index"
+            layer="canonical.launchpad.layers.CodeLayer"/>
+        <browser:page
+            for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+            class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBuildView"
+            name="+index"
+            template="../../lib/lp/code/templates/sourcepackagerecipe-index.pt"
+            permission="zope.Public"/>
+    </facet>
+</configure>

=== added symlink 'configs/testrunner/build-from-branch.zcml'
=== target is u'../development/build-from-branch.zcml'
=== modified file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py	2010-03-25 14:38:25 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py	2010-04-05 18:28:37 +0000
@@ -40,7 +40,7 @@
     """
 
     NEEDSBUILD = DBItem(0, """
-        Needs building
+        Pending build
 
         Build record is fresh and needs building. Nothing is yet known to
         block this build and it is a candidate for building on any free
@@ -48,7 +48,7 @@
         """)
 
     FULLYBUILT = DBItem(1, """
-        Successfully built
+        Successful build
 
         Build record is an historic account of the build. The build is complete
         and needs no further work to complete it. The build log etc are all
@@ -65,7 +65,7 @@
         """)
 
     MANUALDEPWAIT = DBItem(3, """
-        Dependency wait
+        Could not build because of missing dependencies
 
         Build record represents a package whose build dependencies cannot
         currently be satisfied within the relevant DistroArchSeries. This
@@ -74,7 +74,7 @@
         """)
 
     CHROOTWAIT = DBItem(4, """
-        Chroot problem
+        Could not build because of chroot problem
 
         Build record represents a build which needs a chroot currently known
         to be damaged or bad in some way. The buildd maintainer will have to
@@ -83,7 +83,7 @@
         """)
 
     SUPERSEDED = DBItem(5, """
-        Build for superseded Source
+        Could not build because source package was superseded
 
         Build record represents a build which never got to happen because the
         source package release for the build was superseded before the job
@@ -99,7 +99,7 @@
         """)
 
     FAILEDTOUPLOAD = DBItem(7, """
-        Failed to upload
+        Could not be uploaded correctly
 
         Build record is an historic account of a build that could not be
         uploaded correctly. It's mainly genereated by failures in

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-03-31 02:15:04 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-04-05 18:28:37 +0000
@@ -664,12 +664,12 @@
             raise NotFoundError(name)
 
     def new(self, processor, url, name, title, description, owner,
-            active=True, virtualized=False, vm_host=None):
+            active=True, virtualized=False, vm_host=None, manual=True):
         """See IBuilderSet."""
         return Builder(processor=processor, url=url, name=name, title=title,
                        description=description, owner=owner, active=active,
                        virtualized=virtualized, vm_host=vm_host,
-                       builderok=True, manual=True)
+                       builderok=True, manual=manual)
 
     def get(self, builder_id):
         """See IBuilderSet."""

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-03-12 18:53:55 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-04-05 18:28:37 +0000
@@ -6,3 +6,64 @@
 __metaclass__ = type
 
 __all__ = []
+
+
+from canonical.launchpad.webapp import (
+    LaunchpadView)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+
+
+class SourcePackageRecipeView(LaunchpadView):
+    """Default view of a SourcePackageRecipe."""
+
+    @property
+    def title(self):
+        return self.context.name
+
+    label = title
+
+    @property
+    def builds(self):
+        """A list of interesting builds.
+
+        All pending builds are shown, as well as 1-5 recent builds.
+        Recent builds are ordered by date completed.
+        """
+        builds = list(self.context.getBuilds(pending=True))
+        for build in self.context.getBuilds():
+            builds.append(build)
+            if len(builds) >= 5:
+                break
+        builds.reverse()
+        return builds
+
+
+class SourcePackageRecipeBuildView(LaunchpadView):
+    """Default view of a SourcePackageRecipeBuild."""
+
+    @property
+    def status(self):
+        """A human-friendly status string."""
+        if self.context.buildstate == BuildStatus.NEEDSBUILD:
+            if self.eta is None:
+                return 'No suitable builders'
+        return self.context.buildstate.title
+
+    @property
+    def eta(self):
+        """The datetime when the build job is estimated to begin."""
+        if self.context.buildqueue_record is None:
+            return None
+        return self.context.buildqueue_record.getEstimatedJobStartTime()
+
+    @property
+    def date(self):
+        """The date when the build complete or will begin."""
+        if self.estimate:
+            return self.eta
+        return self.context.datebuilt
+
+    @property
+    def estimate(self):
+        """If true, the date value is an estimate."""
+        return (self.context.datebuilt is None and self.eta is not None)

=== added file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-04-05 18:28:37 +0000
@@ -0,0 +1,128 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the product view classes and templates."""
+
+__metaclass__ = type
+
+
+from datetime import datetime
+from textwrap import dedent
+import re
+
+from pytz import utc
+from canonical.testing import DatabaseFunctionalLayer
+from zope.security.proxy import removeSecurityProxy
+
+from canonical.launchpad.webapp import canonical_url
+from canonical.launchpad.testing.pages import extract_text, find_main_content
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.code.browser.sourcepackagerecipe import SourcePackageRecipeView
+from lp.testing import (TestCaseWithFactory)
+
+
+class TestSourcePackageRecipeView(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def makeRecipe(self):
+        chef = self.factory.makePersonNoCommit(displayname='Master Chef',
+                name='chef')
+        chocolate = self.factory.makeProduct(name='chocolate')
+        cake_branch = self.factory.makeProductBranch(
+            owner=chef, name='cake', product=chocolate)
+        distroseries = self.factory.makeDistroSeries(
+            displayname='Secret Squirrel')
+        return self.factory.makeSourcePackageRecipe(
+            None, chef, distroseries, None, u'cake_recipe',
+            u'This recipe builds a foo for disto bar, with my Secret Squirrel'
+            ' changes.', cake_branch)
+
+    def getMainText(self, recipe):
+        browser = self.getUserBrowser(canonical_url(recipe))
+        return extract_text(find_main_content(browser.contents))
+
+    def test_index(self):
+        recipe = self.makeRecipe()
+        build = removeSecurityProxy(self.factory.makeSourcePackageRecipeBuild(
+            recipe=recipe))
+        build.buildstate = BuildStatus.FULLYBUILT
+        build.datebuilt = datetime(2010, 03, 16, tzinfo=utc)
+        pattern = re.compile(dedent("""\
+            Master Chef
+            Branches
+            Description
+            This recipe .*changes.
+            Recipe information
+            Owner:
+            Master Chef
+            Base branch:
+            lp://dev/~chef/chocolate/cake
+            Debian version:
+            1.0
+            Distribution series:
+            Secret Squirrel
+            Build records
+            Successful build.on 2010-03-16
+            Recipe contents
+            # bzr-builder format 0.2 deb-version 1.0
+            lp://dev/~chef/chocolate/cake"""), re.S)
+        main_text = self.getMainText(recipe)
+        self.assertTrue(pattern.search(main_text), repr(main_text))
+
+    def test_index_no_suitable_builders(self):
+        recipe = self.makeRecipe()
+        build = removeSecurityProxy(self.factory.makeSourcePackageRecipeBuild(
+            recipe=recipe))
+        pattern = re.compile(dedent("""\
+            Build records
+            No suitable builders
+            Recipe contents"""), re.S)
+        main_text = self.getMainText(recipe)
+        self.assertTrue(pattern.search(main_text), main_text)
+
+    def makeBuildJob(self, recipe):
+        build = self.factory.makeSourcePackageRecipeBuild(recipe=recipe)
+        buildjob = self.factory.makeSourcePackageRecipeBuildJob(
+            recipe_build=build)
+        return build
+
+    def test_index_pending(self):
+        recipe = self.makeRecipe()
+        buildjob = self.makeBuildJob(recipe)
+        builder = self.factory.makeBuilder()
+        pattern = re.compile(dedent("""\
+            Build records
+            Pending build.in .*\(estimated\)
+            Recipe contents"""), re.S)
+        main_text = self.getMainText(recipe)
+        self.assertTrue(pattern.search(main_text), main_text)
+
+    def test_builds(self):
+        """Ensure SourcePackageRecipeView.builds is as described."""
+        recipe = self.makeRecipe()
+        build1 = self.makeBuildJob(recipe=recipe)
+        build2 = self.makeBuildJob(recipe=recipe)
+        build3 = self.makeBuildJob(recipe=recipe)
+        build4 = self.makeBuildJob(recipe=recipe)
+        build5 = self.makeBuildJob(recipe=recipe)
+        build6 = self.makeBuildJob(recipe=recipe)
+        view = SourcePackageRecipeView(recipe, None)
+        self.assertEqual(
+            set([build1, build2, build3, build4, build5, build6]),
+            set(view.builds))
+        def set_day(build, day):
+            removeSecurityProxy(build).datebuilt = datetime(
+                2010, 03, day, tzinfo=utc)
+        set_day(build1, 16)
+        set_day(build2, 15)
+        # When there are 4+ pending builds, only the the most
+        # recently-completed build is returned (i.e. build1, not build2)
+        self.assertEqual(
+            set([build1, build3, build4, build5, build6]),
+            set(view.builds))
+        set_day(build3, 14)
+        set_day(build4, 13)
+        set_day(build5, 12)
+        set_day(build6, 11)
+        self.assertEqual([build5, build4, build3, build2, build1], view.builds)

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-03-25 19:55:16 +0000
+++ lib/lp/code/configure.zcml	2010-04-05 18:28:37 +0000
@@ -1004,10 +1004,17 @@
   <adapter factory="lp.code.model.recipebuilder.RecipeBuildBehavior"
            permission="zope.Public" />
 
+  <!-- SourcePackageRecipeData -->
+  <class
+     class="lp.code.model.sourcepackagerecipedata.SourcePackageRecipeData">
+    <allow
+    interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeData"/>
+  </class>
   <!-- SourcePackageRecipe -->
   <class
      class="lp.code.model.sourcepackagerecipe.SourcePackageRecipe">
-    <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/>
+    <allow
+    interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/>
     <require
        permission="launchpad.Edit"
        set_attributes="builder_recipe build_daily"/>

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-03-26 19:29:56 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-04-05 18:28:37 +0000
@@ -13,6 +13,7 @@
 __all__ = [
     'ForbiddenInstruction',
     'ISourcePackageRecipe',
+    'ISourcePackageRecipeData',
     'ISourcePackageRecipeSource',
     'TooNewRecipeFormat',
     ]
@@ -21,7 +22,7 @@
 from lazr.restful.fields import CollectionField, Reference
 
 from zope.interface import Attribute, Interface
-from zope.schema import Bool, Datetime, Text, TextLine
+from zope.schema import Bool, Datetime, Object, TextLine, Text
 
 from canonical.launchpad import _
 from canonical.launchpad.validators.name import name_validator
@@ -50,7 +51,20 @@
         self.newest_supported = newest_supported
 
 
-class ISourcePackageRecipe(IHasOwner):
+class ISourcePackageRecipeData(Interface):
+    """A recipe as database data, not text."""
+
+    base_branch = Object(
+        schema=IBranch, title=_("Base branch"), description=_(
+            "The base branch to use when building the recipe."))
+
+    deb_version_template = TextLine(
+        title=_('deb-version template'),
+        description = _(
+            'The template that will be used to generate a deb version.'),)
+
+
+class ISourcePackageRecipe(IHasOwner, ISourcePackageRecipeData):
     """An ISourcePackageRecipe describes how to build a source package.
 
     More precisely, it describes how to combine a number of branches into a
@@ -105,6 +119,13 @@
             able to upload to the archive.
         """
 
+    def getBuilds(pending=False):
+        """Return a ResultSet of all the builds in the given state.
+
+        :param pending: If True, select all builds that are pending.  If
+            False, select all builds that are not pending.
+        """
+
 
 class ISourcePackageRecipeSource(Interface):
     """A utility of this interface can be used to create and access recipes.

=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2010-03-26 19:29:56 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2010-04-05 18:28:37 +0000
@@ -8,8 +8,10 @@
     'SourcePackageRecipe',
     ]
 
+from lazr.delegates import delegates
+
 from storm.locals import (
-    Bool, Int, Reference, ReferenceSet, Store, Storm, Unicode)
+    Bool, Desc, Int, Reference, ReferenceSet, Store, Storm, Unicode)
 
 from zope.component import getUtility
 from zope.interface import classProvides, implements
@@ -19,10 +21,12 @@
 
 from lp.archiveuploader.permission import check_upload_to_archive
 from lp.code.interfaces.sourcepackagerecipe import (
-    ISourcePackageRecipe, ISourcePackageRecipeSource)
+    ISourcePackageRecipe, ISourcePackageRecipeSource,
+    ISourcePackageRecipeData)
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource)
-from lp.code.model.sourcepackagerecipedata import _SourcePackageRecipeData
+from lp.code.model.sourcepackagerecipebuild import SourcePackageRecipeBuild
+from lp.code.model.sourcepackagerecipedata import SourcePackageRecipeData
 from lp.registry.model.distroseries import DistroSeries
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.component import IComponentSet
@@ -48,8 +52,11 @@
     __storm_table__ = 'SourcePackageRecipe'
 
     implements(ISourcePackageRecipe)
+
     classProvides(ISourcePackageRecipeSource)
 
+    delegates(ISourcePackageRecipeData, context='_recipe_data')
+
     id = Int(primary=True)
 
     date_created = UtcDateTimeCol(notNull=True)
@@ -77,15 +84,15 @@
     @property
     def _recipe_data(self):
         return Store.of(self).find(
-            _SourcePackageRecipeData,
-            _SourcePackageRecipeData.sourcepackage_recipe == self).one()
+            SourcePackageRecipeData,
+            SourcePackageRecipeData.sourcepackage_recipe == self).one()
 
     def _get_builder_recipe(self):
-        """Accesses of the recipe go to the _SourcePackageRecipeData."""
+        """Accesses of the recipe go to the SourcePackageRecipeData."""
         return self._recipe_data.getRecipe()
 
     def _set_builder_recipe(self, value):
-        """Setting of the recipe goes to the _SourcePackageRecipeData."""
+        """Setting of the recipe goes to the SourcePackageRecipeData."""
         self._recipe_data.setRecipe(value)
 
     builder_recipe = property(_get_builder_recipe, _set_builder_recipe)
@@ -104,7 +111,7 @@
         """See `ISourcePackageRecipeSource.new`."""
         store = IMasterStore(SourcePackageRecipe)
         sprecipe = SourcePackageRecipe()
-        _SourcePackageRecipeData(builder_recipe, sprecipe)
+        SourcePackageRecipeData(builder_recipe, sprecipe)
         sprecipe.registrant = registrant
         sprecipe.owner = owner
         sprecipe.sourcepackagename = sourcepackagename
@@ -132,3 +139,15 @@
             self, requester, archive)
         build.queueBuild()
         return build
+
+    def getBuilds(self, pending=False):
+        """See `ISourcePackageRecipe`."""
+        if pending:
+            clauses = [SourcePackageRecipeBuild.datebuilt == None]
+        else:
+            clauses = [SourcePackageRecipeBuild.datebuilt != None]
+        result = Store.of(self).find(
+            SourcePackageRecipeBuild, SourcePackageRecipeBuild.recipe==self,
+            *clauses)
+        result.order_by(Desc(SourcePackageRecipeBuild.datebuilt))
+        return result

=== modified file 'lib/lp/code/model/sourcepackagerecipedata.py'
--- lib/lp/code/model/sourcepackagerecipedata.py	2010-03-11 15:15:51 +0000
+++ lib/lp/code/model/sourcepackagerecipedata.py	2010-04-05 18:28:37 +0000
@@ -9,7 +9,7 @@
 """
 
 __metaclass__ = type
-__all__ = ['_SourcePackageRecipeData']
+__all__ = ['SourcePackageRecipeData']
 
 from bzrlib.plugins.builder.recipe import (
     BaseRecipeBranch, MergeInstruction, NestInstruction, RecipeBranch)
@@ -79,7 +79,7 @@
     directory = Unicode(allow_none=True)
 
     recipe_data_id = Int(name='recipe_data', allow_none=False)
-    recipe_data = Reference(recipe_data_id, '_SourcePackageRecipeData.id')
+    recipe_data = Reference(recipe_data_id, 'SourcePackageRecipeData.id')
 
     parent_instruction_id = Int(name='parent_instruction', allow_none=True)
     parent_instruction = Reference(
@@ -98,7 +98,7 @@
         return branch
 
 
-class _SourcePackageRecipeData(Storm):
+class SourcePackageRecipeData(Storm):
     """The database representation of a BaseRecipeBranch from bzr-builder.
 
     This is referenced from the SourcePackageRecipe table as the 'recipe_data'
@@ -216,7 +216,7 @@
     def __init__(self, recipe, sourcepackage_recipe):
         """Initialize from the bzr-builder recipe and link it to a db recipe.
         """
-        super(_SourcePackageRecipeData, self).__init__()
+        super(SourcePackageRecipeData, self).__init__()
         self.setRecipe(recipe)
         self.sourcepackage_recipe = sourcepackage_recipe
 

=== added file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
--- lib/lp/code/templates/sourcepackagerecipe-index.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-index.pt	2010-04-05 18:28:37 +0000
@@ -0,0 +1,80 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_side"
+  i18n:domain="launchpad"
+>
+
+
+<body>
+
+<tal:registering metal:fill-slot="registering">
+  Created by
+    <tal:registrant replace="structure context/registrant/fmt:link" />
+  on
+    <tal:created-on replace="structure context/date_created/fmt:date" />
+  and last modified on
+    <tal:last-modified replace="structure context/date_last_modified/fmt:date" />
+</tal:registering>
+
+
+<div metal:fill-slot="main">
+  <div class="yui-g first">
+    <div class="portlet">
+      <h2>Description</h2>
+        <tal:description replace="context/description" />
+      </div>
+    </div>
+    <div class="yui-g">
+      <div class="yui-u first">
+        <div class="portlet">
+          <h2>Recipe information</h2>
+          <div class="two-column-list">
+            <dl id="owner">
+              <dt>Owner:</dt>
+              <dd tal:content="structure context/owner/fmt:link" />
+            </dl>
+            <dl id="base-branch">
+              <dt>Base branch:</dt>
+              <dd tal:content="structure context/base_branch/fmt:link" />
+            </dl>
+            <dl id="debian-version">
+              <dt>Debian version:</dt>
+              <dd tal:content="context/deb_version_template" />
+            </dl>
+            <dl id="distros">
+              <dt>Distribution series:</dt>
+              <dd>
+                <ul>
+                    <li tal:repeat="curseries context/distroseries"
+                        tal:content="structure curseries/fmt:link" />
+                </ul>
+              </dd>
+            </dl>
+          </div>
+        </div>
+      </div>
+      <div class="yui-u">
+        <div class="portlet">
+          <h2>Build records</h2>
+          <ul>
+            <li tal:repeat="build view/builds">
+              <tal:status replace="build/@@+index/status" />
+              <tal:date replace="build/@@+index/date/fmt:displaydate" />
+              <tal:estimate condition="build/@@+index/estimate">
+              (estimated)
+              </tal:estimate>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class='portlet'>
+      <h2>Recipe contents</h2>
+      <pre tal:content="context/builder_recipe" />
+    </div>
+  </div>
+</body>
+</html>

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-03-25 14:50:31 +0000
+++ lib/lp/registry/browser/person.py	2010-04-05 18:28:37 +0000
@@ -446,6 +446,11 @@
             return queryMultiAdapter(
                 (self.context, self.request), name ="+archivesubscriptions")
 
+    @stepthrough('+recipe')
+    def traverse_recipe(self, name):
+        """Traverse to this person's recipes."""
+        return self.context.getRecipe(name)
+
 
 class TeamNavigation(PersonNavigation):
 

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2010-03-25 14:17:56 +0000
+++ lib/lp/registry/interfaces/person.py	2010-04-05 18:28:37 +0000
@@ -872,6 +872,9 @@
         not teams can be converted into teams.
         """
 
+    def getRecipe(name):
+        """Return the person's recipe with the given name."""
+
     def getInvitedMemberships():
         """Return all TeamMemberships of this team with the INVITED status.
 

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-03-30 17:25:52 +0000
+++ lib/lp/registry/model/person.py	2010-04-05 18:28:37 +0000
@@ -2258,6 +2258,12 @@
 
         return rset
 
+    def getRecipe(self, name):
+        from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
+        return Store.of(self).find(
+            SourcePackageRecipe, SourcePackageRecipe.owner == self,
+            SourcePackageRecipe.name == name).one()
+
     def isUploader(self, distribution):
         """See `IPerson`."""
         permissions = getUtility(IArchivePermissionSet).componentsForUploader(

=== modified file 'lib/lp/soyuz/doc/build-failedtoupload-workflow.txt'
--- lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-02-16 02:27:24 +0000
+++ lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-04-05 18:28:37 +0000
@@ -85,7 +85,7 @@
    * Architecture: i386
    * Archive: ubuntu primary archive
    * Component: main
-   * State: Failed to upload
+   * State: Could not be uploaded correctly
    * Duration: a minute
    * Build Log: http://launchpad.dev/ubuntu/+source/cdrkit/1.0/+build/22/+fil=
   es/netapplet-1.0.0.tar.gz

=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/build-notification.txt	2010-04-05 18:28:37 +0000
@@ -178,7 +178,7 @@
    * Architecture: i386
    * Archive: ubuntu primary archive
    * Component: main
-   * State: Needs building
+   * State: Pending build
    * Duration: not available
    * Build Log: not available
    * Builder: not available
@@ -314,7 +314,7 @@
    * Architecture: i386
    * Archive: ubuntu primary archive
    * Component: main
-   * State: Build for superseded Source
+   * State: Could not build because source package was superseded
    * Duration: not available
    * Build Log: not available
    * Builder: not available

=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/build.txt	2010-04-05 18:28:37 +0000
@@ -63,7 +63,7 @@
 CHROOTWAIT, SUPERSEDED and FAILEDTOUPLOAD).
 
     >>> firefox_build.buildstate
-    <DBItem BuildStatus.FULLYBUILT, (1) Successfully built>
+    <DBItem BuildStatus.FULLYBUILT, (1) Successful build>
 
 Builds which were already processed also offer additional information
 about its process such as the time it was started and finished and its

=== modified file 'lib/lp/soyuz/doc/buildd-mass-retry.txt'
--- lib/lp/soyuz/doc/buildd-mass-retry.txt	2009-04-28 12:59:43 +0000
+++ lib/lp/soyuz/doc/buildd-mass-retry.txt	2010-04-05 18:28:37 +0000
@@ -40,9 +40,9 @@
   DEBUG   Intitialising connection.
   INFO    Initialising Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
   INFO    Processing builds in 'Failed to build'
-  INFO    Processing builds in 'Dependency wait'
+  INFO    Processing builds in 'Could not build because of missing dependencies'
   INFO    Retrying i386 build of libstdc++ b8p in ubuntu hoary RELEASE (12)
-  INFO    Processing builds in 'Chroot problem'
+  INFO    Processing builds in 'Could not build because of chroot problem'
   INFO    Success.
   INFO    Dry-run.
   <BLANKLINE>
@@ -62,8 +62,8 @@
   DEBUG   Intitialising connection.
   INFO    Initialising Build Mass-Retry for 'The Hoary Hedgehog Release for hppa (hppa)/RELEASE'
   INFO    Processing builds in 'Failed to build'
-  INFO    Processing builds in 'Dependency wait'
-  INFO    Processing builds in 'Chroot problem'
+  INFO    Processing builds in 'Could not build because of missing dependencies'
+  INFO    Processing builds in 'Could not build because of chroot problem'
   INFO    Success.
   INFO    Dry-run.
   <BLANKLINE>

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-03-24 04:51:25 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-04-05 18:28:37 +0000
@@ -298,7 +298,7 @@
     >>> build.dependencies
     u'baz (>= 1.0.1)'
     >>> build.buildstate.title
-    'Dependency wait'
+    'Could not build because of missing dependencies'
 
 WAITING - CHROOTFAIL -> the Chroot for this distroseries is damage, nor
 builder, but right state stored in Build entry:
@@ -325,7 +325,7 @@
     >>> check_mail_sent(last_stub_mail_count)
     True
     >>> build.buildstate.title
-    'Chroot problem'
+    'Could not build because of chroot problem'
 
 WAITING - BUILDERFAIL -> builder has failed by internal error, job is available for next build round:
 
@@ -352,7 +352,7 @@
     False
     >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem6)
     >>> print build.buildstate.title
-    Needs building
+    Pending build
     >>> job = bqItem6.specific_job.job
     >>> print job.status.title
     Waiting
@@ -473,7 +473,7 @@
     >>> check_mail_sent(last_stub_mail_count)
     True
     >>> build.buildstate.title
-    'Failed to upload'
+    'Could not be uploaded correctly'
 
 Let's check the emails generated by this 'failure'
 (see build-failedtoupload-workflow.txt for more information):
@@ -564,7 +564,7 @@
     >>> build.buildlog is not None
     True
     >>> build.buildstate.title
-    'Successfully built'
+    'Successful build'
     >>> check_mail_sent(last_stub_mail_count)
     False
 
@@ -602,7 +602,7 @@
     False
     >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem11)
     >>> print build.buildstate.title
-    Needs building
+    Pending build
     >>> job = bqItem11.specific_job.job
     >>> print job.status.title
     Waiting

=== modified file 'lib/lp/soyuz/doc/gina.txt'
--- lib/lp/soyuz/doc/gina.txt	2010-03-17 05:48:45 +0000
+++ lib/lp/soyuz/doc/gina.txt	2010-04-05 18:28:37 +0000
@@ -366,7 +366,7 @@
     >>> print ed.build.processor.name
     386
     >>> print ed.build.buildstate
-    Successfully built
+    Successful build
     >>> print ed.build.distroarchseries.processorfamily.name
     x86
     >>> print ed.build.distroarchseries.architecturetag

=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-03-10 13:28:55 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-04-05 18:28:37 +0000
@@ -299,7 +299,7 @@
     James Blackwell
     PPA for James Blackwell
     i386 build of pmount 0.1-1
-    Build status Needs building
+    Build status Pending build
     Start (2505) What's this?
     Build details
     Source: pmount - 0.1-1

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-03-10 13:28:55 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-04-05 18:28:37 +0000
@@ -62,7 +62,7 @@
     i386 build of testing 1.0 in ubuntutest breezy-autotest RELEASE
     ...
     Build status
-    Needs building
+    Pending build
     Start in ... (2505) What's this?
     Build details
     Source: testing - 1.0
@@ -82,7 +82,7 @@
     i386 build of testing 1.0 in ubuntutest breezy-autotest RELEASE
     ...
     Build status
-    Needs building
+    Pending build
     Build details
     Source: testing - 1.0
     Archive: Primary Archive for Ubuntu Test
@@ -134,7 +134,7 @@
 
     >>> print extract_text(find_tag_by_id(admin_browser.contents, 'status'))
     Build status
-    Needs building
+    Pending build
     Start in ... (0) Rescore build What's this?
 
 Eventually a pending build record will get started, and while it's
@@ -203,7 +203,7 @@
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'status'))
     Build status
-    Failed to upload on Bob The Builder
+    Could not be uploaded correctly on Bob The Builder
     Started ... ago
     Finished ... (took 1 minute, 0.0 seconds)
     buildlog (7 bytes)
@@ -229,7 +229,8 @@
     >>> print extract_text(
     ...     find_tag_by_id(admin_browser.contents, 'status'))
     Build status
-    Failed to upload on Bob The Builder Retry this build
+    Could not be uploaded correctly
+    on Bob The Builder Retry this build
     Started ... ago
     Finished ... (took 1 minute, 0.0 seconds)
     buildlog (7 bytes)
@@ -246,7 +247,7 @@
     Retry i386 build of testing 1.0 in ubuntutest breezy-autotest RELEASE
     ...
     The status of i386 build of testing 1.0 in ubuntutest
-    breezy-autotest RELEASE is Failed to upload.
+    breezy-autotest RELEASE is Could not be uploaded correctly.
     Retrying this build will destroy its history and logs.
     By default, this build will be retried only after other pending
     builds; please contact a build daemon administrator if you need
@@ -260,7 +261,7 @@
     >>> print extract_text(
     ...     find_tag_by_id(admin_browser.contents, 'status'))
     Build status
-    Failed to upload on Bob The Builder Retry this build
+    Could not be uploaded correctly on Bob The Builder Retry this build
     Started ... ago
     Finished ... (took 1 minute, 0.0 seconds)
     buildlog (7 bytes)
@@ -278,7 +279,7 @@
 
     >>> print extract_text(find_tag_by_id(admin_browser.contents, 'status'))
     Build status
-    Needs building
+    Pending build
     Start in ... (0) Rescore build What's this?
 
     >>> admin_browser.getLink("Retry this build").click()
@@ -315,7 +316,7 @@
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'status'))
     Build status
-    Successfully built on Bob The Builder
+    Successful build on Bob The Builder
     Started on 2008-01-01
     Finished on 2008-01-01 (took 5 minutes, 0.0 seconds)
     buildlog (6 bytes)
@@ -452,7 +453,7 @@
 
     >>> print extract_text(find_tag_by_id(anon_browser.contents, 'status'))
     Build status
-    Successfully built on Bob The Builder
+    Successful build on Bob The Builder
     Started on ...
     Finished on ... (took 5 minutes, 0.0 seconds)
     buildlog (6 bytes)

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt	2010-03-08 09:19:45 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt	2010-04-05 18:28:37 +0000
@@ -136,17 +136,17 @@
 
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Successfully built
+    Successful build
     hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     Build started on 2007-08-10 on Bob The Builder and finished on 2007-08-10
     taking 15 seconds &mdash; see the log
     ------------------------------
-    Successfully built
+    Successful build
     i386 build of commercialpackage 1.0-1 in ubuntu breezy-autotest RELEASE
     Build started at an unknown time on an unknown build machine and finished
     on 2007-08-09 taking
     ------------------------------
-    Failed to upload
+    Could not be uploaded correctly
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     Build started on 2007-04-19 on Bob The Builder and finished on 2007-04-20
     taking a minute &mdash; see the log
@@ -164,23 +164,23 @@
     >>> anon_browser.getLink("Next").click()
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Build for superseded Source
+    Could not build because source package was superseded
     i386 build of at 0.00 in ubuntu warty RELEASE
     ------------------------------
-    Build for superseded Source
+    Could not build because source package was superseded
     i386 build of linux-source-2.6.15 2.6.15.3 in ubuntu warty RELEASE
     ------------------------------
-    Build for superseded Source
+    Could not build because source package was superseded
     i386 build of netapplet 0.99.6-1 in ubuntu warty RELEASE
     ------------------------------
-    Dependency wait
+    Could not build because of missing dependencies
     i386 build of libstdc++ b8p in ubuntu hoary RELEASE
     Missing dependencies:
     cpp (&gt;= 4:4.0.1-3), gcc-4.0 (&gt;= 4.0.1-2)
     Build started on 2006-02-27 on Bob The Builder and finished on 2006-02-28
     taking six minutes &mdash; see the log
     ------------------------------
-    Needs building
+    Pending build
     i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE
     Pending (10)
     ------------------------------
@@ -193,27 +193,27 @@
     >>> anon_browser.getControl("Filter").click()
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Successfully built
+    Successful build
     hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     Build started on 2007-08-10 on Bob The Builder and finished on 2007-08-10
     taking 15 seconds &mdash; see the log
     ------------------------------
-    Successfully built
+    Successful build
     i386 build of commercialpackage 1.0-1 in ubuntu breezy-autotest RELEASE
     Build started at an unknown time on an unknown build machine and finished
     on 2007-08-09 taking
     ------------------------------
-    Successfully built
+    Successful build
     i386 build of pmount 0.1-1 in ubuntu hoary RELEASE
     Build started on 2005-03-24 on Bob The Builder and finished on 2005-03-25
     taking a minute &mdash; see the log
     ------------------------------
-    Successfully built
+    Successful build
     hppa build of pmount 0.1-1 in ubuntu hoary RELEASE
     Build started on 2005-03-24 on Bob The Builder and finished on 2005-03-25
     taking a minute &mdash; see the log
     ------------------------------
-    Successfully built
+    Successful build
     i386 build of pmount 0.1-1 in ubuntu breezy-autotest RELEASE
     Build started on 2005-03-24 on Bob The Builder and finished on 2005-03-25
     taking a minute &mdash; see the log
@@ -223,7 +223,7 @@
     >>> anon_browser.getControl("Filter").click()
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Dependency wait
+    Could not build because of missing dependencies
     i386 build of libstdc++ b8p in ubuntu hoary RELEASE
     Missing dependencies:
     cpp (&gt;= 4:4.0.1-3), gcc-4.0 (&gt;= 4.0.1-2)
@@ -301,17 +301,17 @@
 
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Successfully built
-    hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
-    Build started on 2007-08-10 and finished on 2007-08-10
-    taking 15 seconds &mdash; see the log
-    ------------------------------
-    Successfully built
-    hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
-    Build started on 2007-08-10 and finished on 2007-08-10
-    taking 15 seconds &mdash; see the log
-    ------------------------------
-    Successfully built
+    Successful build
+    hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
+    Build started on 2007-08-10 and finished on 2007-08-10
+    taking 15 seconds &mdash; see the log
+    ------------------------------
+    Successful build
+    hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
+    Build started on 2007-08-10 and finished on 2007-08-10
+    taking 15 seconds &mdash; see the log
+    ------------------------------
+    Successful build
     i386 build of pmount 0.1-1 in ubuntu warty RELEASE
     Build started on 2007-07-23 and finished on 2007-07-24
     taking a minute &mdash; see the log
@@ -334,7 +334,7 @@
     >>> anon_browser.getLink("Next").click()
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Failed to upload
+    Could not be uploaded correctly
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     Build started on 2007-04-19 and finished on 2007-04-20
     taking a minute &mdash; see the log
@@ -344,13 +344,13 @@
     Build started on 2006-12-01 and finished on 2006-12-01
     taking 1 second &mdash; see the log
     ------------------------------
-    Build for superseded Source
+    Could not build because source package was superseded
     i386 build of netapplet 0.99.6-1 in ubuntu warty RELEASE
     ------------------------------
-    Build for superseded Source
+    Could not build because source package was superseded
     i386 build of linux-source-2.6.15 2.6.15.3 in ubuntu warty RELEASE
     ------------------------------
-    Build for superseded Source
+    Could not build because source package was superseded
     i386 build of at 0.00 in ubuntu warty RELEASE
     ------------------------------
 
@@ -360,7 +360,7 @@
     >>> anon_browser.getLink("Next").click()
     >>> print_build_rows(anon_browser.contents)
     ------------------------------
-    Dependency wait
+    Could not build because of missing dependencies
     i386 build of libstdc++ b8p in ubuntu hoary RELEASE
     Missing dependencies:
     cpp (&gt;= 4:4.0.1-3), gcc-4.0 (&gt;= 4.0.1-2)

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-private-builds.txt'
--- lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2010-03-08 13:07:07 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2010-04-05 18:28:37 +0000
@@ -338,7 +338,7 @@
     >>> portlet = find_portlet(browser.contents, 'Builds')
     >>> print extract_text(portlet)
     Builds
-    breezy-autotest i386 Successfully built
+    breezy-autotest i386 Successful build
 
     >>> print browser.getLink('i386').url
     http://launchpad.dev/~cprov/+archive/p3a/+build/...

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-04-05 17:40:35 +0000
+++ lib/lp/testing/factory.py	2010-04-05 18:28:37 +0000
@@ -1622,12 +1622,14 @@
 
     def makeDistroRelease(self, distribution=None, version=None,
                           status=SeriesStatus.DEVELOPMENT,
-                          parent_series=None, name=None):
+                          parent_series=None, name=None, displayname=None):
         """Make a new distro release."""
         if distribution is None:
             distribution = self.makeDistribution()
         if name is None:
             name = self.getUniqueString()
+        if displayname is None:
+            displayname = name.capitalize()
         if version is None:
             version = "%s.0" % self.getUniqueInteger()
 
@@ -1637,7 +1639,7 @@
         series = naked_distribution.newSeries(
             version=version,
             name=name,
-            displayname=name.capitalize(),
+            displayname=displayname,
             title=self.getUniqueString(), summary=self.getUniqueString(),
             description=self.getUniqueString(),
             parent_series=parent_series, owner=distribution.owner)
@@ -1716,7 +1718,7 @@
 
     def makeBuilder(self, processor=None, url=None, name=None, title=None,
                     description=None, owner=None, active=True,
-                    virtualized=True, vm_host=None):
+                    virtualized=True, vm_host=None, manual=False):
         """Make a new builder for i386 virtualized builds by default.
 
         Note: the builder returned will not be able to actually build -
@@ -1740,7 +1742,7 @@
 
         return getUtility(IBuilderSet).new(
             processor, url, name, title, description, owner, active,
-            virtualized, vm_host)
+            virtualized, vm_host, manual=manual)
 
     def makeRecipe(self, *branches):
         """Make a builder recipe that references `branches`.
@@ -1800,11 +1802,12 @@
 
     def makeSourcePackageRecipeBuildJob(
         self, score=9876, virtualized=True, estimated_duration=64,
-        sourcename=None):
+        sourcename=None, recipe_build=None):
         """Create a `SourcePackageRecipeBuildJob` and a `BuildQueue` for
         testing."""
-        recipe_build = self.makeSourcePackageRecipeBuild(
-            sourcename=sourcename)
+        if recipe_build is None:
+            recipe_build = self.makeSourcePackageRecipeBuild(
+                sourcename=sourcename)
         recipe_build_job = recipe_build.makeJob()
 
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)