[vpython] Enable base wheels, spec merging.

[vpython] Enable base wheels, spec merging.

Enable base wheel support. This allows an application instance to
specify a set of wheels that will always be included with every vpython
spec, regardless of whether or not the spec explicitly specifies them.

To support this, enhance wheel merging. Duplicate wheel declarations which
share the same versions will have their parameters deduplicated and
merged into a single wheel spec.

BUG=chromium:740320
TEST=None

Review-Url: https://codereview.chromium.org/2971403002
Committed: https://github.com/luci/luci-go/commit/494156a450069cafd4bee1bbd43f327a148cb698

[dnj, 2017-07-08 17:22:04]

The CQ bit was checked by dnj@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-07-08 17:22:14]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-07-08 17:27:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-07-08 17:27:44]

Dry run: Try jobs failed on following builders:
  Luci-go Win Tester on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/373c0accb4b50b10)

[dnj, 2017-07-10 19:24:34]

The CQ bit was checked by dnj@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-07-10 19:24:43]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-07-10 19:32:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-07-10 19:32:51]

Dry run: This issue passed the CQ dry run.

[iannucci, 2017-07-10 19:42:51]

iannucci@chromium.org changed reviewers:
+ iannucci@chromium.org

[iannucci, 2017-07-10 19:42:52]

lgtm

https://codereview.chromium.org/2971403002/diff/1/vpython/application/applica...
File vpython/application/application.go (right):

https://codereview.chromium.org/2971403002/diff/1/vpython/application/applica...
vpython/application/application.go:75: // wheels will be deduplicated.
who wins? what if there are conflicting versions?

https://codereview.chromium.org/2971403002/diff/1/vpython/spec/spec.go
File vpython/spec/spec.go (right):

https://codereview.chromium.org/2971403002/diff/1/vpython/spec/spec.go#newcode46
vpython/spec/spec.go:46: // share a version. If they don't, an error will be
returned. Otherwise, they
I guess for base wheels we only ever intend to have a single package at a single
version, and anyone who wants to migrate off will need to opt out of the base
wheels and re-specify the real wheels?

https://codereview.chromium.org/2971403002/diff/1/vpython/spec/spec.go#newcode84
vpython/spec/spec.go:84: // If thius package doesn't match the tag set, skip it.
this

[dnj, 2017-07-10 20:06:30]

https://codereview.chromium.org/2971403002/diff/1/vpython/application/applica...
File vpython/application/application.go (right):

https://codereview.chromium.org/2971403002/diff/1/vpython/application/applica...
vpython/application/application.go:75: // wheels will be deduplicated.
On 2017/07/10 19:42:52, iannucci wrote:
> who wins? what if there are conflicting versions?

Nobody, it's a straight-up error.

https://codereview.chromium.org/2971403002/diff/1/vpython/spec/spec.go
File vpython/spec/spec.go (right):

https://codereview.chromium.org/2971403002/diff/1/vpython/spec/spec.go#newcode46
vpython/spec/spec.go:46: // share a version. If they don't, an error will be
returned. Otherwise, they
On 2017/07/10 19:42:52, iannucci wrote:
> I guess for base wheels we only ever intend to have a single package at a
single
> version, and anyone who wants to migrate off will need to opt out of the base
> wheels and re-specify the real wheels?

Yeah. Currently no path to opt out of base wheels, though, except for building
your own "vpython" w/out them built in.

https://codereview.chromium.org/2971403002/diff/1/vpython/spec/spec.go#newcode84
vpython/spec/spec.go:84: // If thius package doesn't match the tag set, skip it.
On 2017/07/10 19:42:52, iannucci wrote:
> this

Done.

[dnj, 2017-07-11 00:54:53]

The CQ bit was checked by dnj@chromium.org

[dnj, 2017-07-11 00:54:53]

The patchset sent to the CQ was uploaded after l-g-t-m from
iannucci@chromium.org
Link to the patchset: https://codereview.chromium.org/2971403002/#ps20001
(title: "fix comment")

[commit-bot: I haz the power, 2017-07-11 00:55:03]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-07-11 01:00:54]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1499734493145680,
"parent_rev": "b8f6eb4b659ad1cd4511d0e6320fe3c7d9fe4a3b", "commit_rev":
"494156a450069cafd4bee1bbd43f327a148cb698"}

[commit-bot: I haz the power, 2017-07-11 01:00:57]

Description was changed from

==========
[vpython] Enable base wheels, spec merging.

Enable base wheel support. This allows an application instance to
specify a set of wheels that will always be included with every vpython
spec, regardless of whether or not the spec explicitly specifies them.

To support this, enhance wheel merging. Duplicate wheel declarations which
share the same versions will have their parameters deduplicated and
merged into a single wheel spec.

BUG=chromium:740320
TEST=None
==========

to

==========
[vpython] Enable base wheels, spec merging.

Enable base wheel support. This allows an application instance to
specify a set of wheels that will always be included with every vpython
spec, regardless of whether or not the spec explicitly specifies them.

To support this, enhance wheel merging. Duplicate wheel declarations which
share the same versions will have their parameters deduplicated and
merged into a single wheel spec.

BUG=chromium:740320
TEST=None

Review-Url: https://codereview.chromium.org/2971403002
Committed:
https://github.com/luci/luci-go/commit/494156a450069cafd4bee1bbd43f327a148cb698
==========

[commit-bot: I haz the power, 2017-07-11 01:00:58]

Committed patchset #2 (id:20001) as
https://github.com/luci/luci-go/commit/494156a450069cafd4bee1bbd43f327a148cb698