[vpython] Add conditional packages based on PEP425

vpython/api/vpython/spec.pb.go

Index: vpython/api/vpython/spec.pb.go
diff --git a/vpython/api/vpython/spec.pb.go b/vpython/api/vpython/spec.pb.go
index c5ab188be635cb9601c4b98771c5840f117ad94b..faa7e18cb43a03f70370c8b8fd41e54fc373bdd4 100644
--- a/vpython/api/vpython/spec.pb.go
+++ b/vpython/api/vpython/spec.pb.go
@@ -88,6 +88,17 @@ type Spec_Package struct {
 	// - For CIPD, this will be any recognized CIPD version (i.e., ID, tag, or
 	//   ref).
 	Version string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	// Optional PEP425 tags to determine whether this package is included on the
+	// target system. If no match tags are specified, this package will always
+	// be included. If match tags are specified, the package will be included if
+	// any system PEP425 tags match at least one of the match tags.
+	//
+	// A match will succeed if any system PEP425 tag field matches the
+	// corresponding field in the PEP425 tag. If the match tag omits a field
+	// (partial), that field will not be considered. For example, if a match
+	// tag specifies just an ABI field, any system PEP425 tag with that ABI will
+	// be considered a successful match, regardless of other field values.
+	MatchTag []*Pep425Tag `protobuf:"bytes,3,rep,name=match_tag,json=matchTag" json:"match_tag,omitempty"`
 }
 
 func (m *Spec_Package) Reset()                    { *m = Spec_Package{} }
@@ -109,6 +120,13 @@ func (m *Spec_Package) GetVersion() string {
 	return ""
 }
 
+func (m *Spec_Package) GetMatchTag() []*Pep425Tag {
+	if m != nil {
+		return m.MatchTag
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Spec)(nil), "vpython.Spec")
 	proto.RegisterType((*Spec_Package)(nil), "vpython.Spec.Package")
@@ -119,21 +137,22 @@ func init() {
 }
 
 var fileDescriptor2 = []byte{
-	// 249 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4b, 0xcf, 0x2c, 0xc9,
-	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0x29, 0x4d, 0xce, 0x04, 0x13, 0xba, 0xe9, 0xf9,
-	0xfa, 0x65, 0x05, 0x95, 0x25, 0x19, 0xf9, 0x79, 0xfa, 0x89, 0x05, 0x99, 0x70, 0x76, 0x71, 0x41,
-	0x6a, 0xb2, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x10, 0x3b, 0x54, 0x4c, 0xca, 0x82, 0x14, 0x03,
-	0x0a, 0x52, 0x0b, 0x4c, 0x8c, 0x4c, 0x21, 0x46, 0x28, 0x75, 0x31, 0x71, 0xb1, 0x04, 0x17, 0xa4,
-	0x26, 0x0b, 0xa9, 0x72, 0xf1, 0x41, 0xe4, 0xe3, 0xcb, 0x52, 0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24,
-	0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x78, 0x21, 0xa2, 0x61, 0x10, 0x41, 0x21, 0x6d, 0x2e, 0xd6,
-	0xf2, 0x8c, 0xd4, 0xd4, 0x1c, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x51, 0x3d, 0xa8, 0xa9,
-	0x7a, 0x20, 0x43, 0xf4, 0x02, 0x12, 0x93, 0xb3, 0x13, 0xd3, 0x53, 0x83, 0x20, 0x6a, 0x84, 0x4c,
-	0xb9, 0xb8, 0xca, 0x32, 0x8b, 0x4a, 0x4a, 0x13, 0x73, 0x52, 0xf3, 0xca, 0x24, 0x98, 0x15, 0x18,
-	0x71, 0xeb, 0x40, 0x52, 0x28, 0x64, 0xc7, 0x25, 0x58, 0x96, 0x5a, 0x94, 0x99, 0x56, 0x19, 0x0f,
-	0x71, 0x6a, 0x7c, 0x49, 0x62, 0xba, 0x04, 0x0b, 0xd8, 0x3e, 0x21, 0xb8, 0xee, 0x00, 0xb0, 0x54,
-	0x48, 0x62, 0x7a, 0x10, 0x3f, 0x44, 0x31, 0x5c, 0x40, 0xca, 0x9c, 0x8b, 0x1d, 0x6a, 0xac, 0x90,
-	0x10, 0x17, 0x4b, 0x5e, 0x62, 0x6e, 0x2a, 0xd4, 0x2f, 0x60, 0xb6, 0x90, 0x04, 0x17, 0x3b, 0xcc,
-	0x8b, 0x4c, 0x60, 0x61, 0x18, 0x37, 0x89, 0x0d, 0x1c, 0x26, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xb5, 0x8f, 0xa2, 0xff, 0x90, 0x01, 0x00, 0x00,
+	// 264 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xcf, 0x4a, 0xc4, 0x30,
+	0x10, 0xc6, 0xe9, 0x1f, 0xad, 0x3b, 0xa2, 0xe2, 0x80, 0x50, 0xf6, 0x54, 0x04, 0x61, 0x41, 0x6c,
+	0x61, 0x75, 0xc5, 0x93, 0xcf, 0xb0, 0xd4, 0xc5, 0x6b, 0xc9, 0x86, 0x31, 0x0d, 0xb6, 0x4d, 0xe8,
+	0xa6, 0x91, 0x7d, 0x36, 0x5f, 0x4e, 0x4c, 0xba, 0xc5, 0xcb, 0x1e, 0xbc, 0x84, 0xc9, 0x37, 0xdf,
+	0xfc, 0xbe, 0x4c, 0xe0, 0x59, 0x48, 0x53, 0x0f, 0xdb, 0x9c, 0xab, 0xb6, 0x68, 0x06, 0x2e, 0xdd,
+	0xf1, 0x20, 0x54, 0x61, 0xf5, 0xde, 0xd4, 0xaa, 0x2b, 0x98, 0x96, 0x53, 0xbd, 0xd3, 0xc4, 0x73,
+	0xdd, 0x2b, 0xa3, 0x30, 0x19, 0xb5, 0xf9, 0xcb, 0x7f, 0x00, 0x9a, 0xf4, 0xd3, 0x72, 0xe5, 0x11,
+	0xb7, 0xdf, 0x21, 0xc4, 0x6f, 0x9a, 0x38, 0xde, 0xc1, 0xa5, 0xef, 0x57, 0x96, 0xfa, 0x9d, 0x54,
+	0x5d, 0x1a, 0x64, 0xc1, 0x62, 0x56, 0x5e, 0x78, 0xf5, 0xdd, 0x8b, 0x78, 0x0f, 0x27, 0x5f, 0x35,
+	0x51, 0x93, 0x86, 0x59, 0xb4, 0x38, 0x5f, 0xde, 0xe4, 0x23, 0x35, 0xff, 0x85, 0xe4, 0x6b, 0xc6,
+	0x3f, 0x99, 0xa0, 0xd2, 0x7b, 0x70, 0x05, 0x60, 0x65, 0x6f, 0x06, 0xd6, 0x50, 0x67, 0xd3, 0x28,
+	0x0b, 0x8e, 0x4f, 0xfc, 0x31, 0xe2, 0x2b, 0x5c, 0x5b, 0xea, 0xe5, 0xc7, 0xbe, 0xf2, 0x4f, 0xad,
+	0x0c, 0x13, 0x69, 0xec, 0xf2, 0x70, 0x9a, 0x5e, 0xbb, 0xd6, 0x86, 0x89, 0xf2, 0xca, 0x9b, 0x27,
+	0x61, 0x5e, 0x43, 0x32, 0x62, 0x11, 0x21, 0xee, 0x58, 0x4b, 0xe3, 0x2e, 0xae, 0xc6, 0x14, 0x92,
+	0xc3, 0x8a, 0xa1, 0x93, 0x0f, 0x57, 0x2c, 0x60, 0xd6, 0x32, 0xc3, 0x6b, 0x17, 0x18, 0x1d, 0x0d,
+	0x3c, 0x73, 0xa6, 0x0d, 0x13, 0xdb, 0x53, 0xf7, 0x89, 0x8f, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0xb3, 0xe0, 0x12, 0xd4, 0xc1, 0x01, 0x00, 0x00,
 }