vpython: Leave "pip" and related tools.

vpython/venv/config.go

 // Copyright 2017 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package venv
 
 import (
         "fmt"
         "os"
         "path/filepath"
@@ skipping 166 matching lines @@
         }
 
         // Generate our environment name based on the deterministic hash of its
         // fully-resolved specification.
         return cfg.envForName(cfg.envNameForSpec(e.Spec), e), nil
 }
 
 // EnvName returns the VirtualEnv environment name for the environment that cfg
 // describes.
 func (cfg *Config) envNameForSpec(s *vpython.Spec) string {
-        name := spec.Hash(s)
+        name := spec.Hash(s, EnvironmentVersion)
         if cfg.MaxHashLen > 0 && len(name) > cfg.MaxHashLen {
                 name = name[:cfg.MaxHashLen]
         }
         return name
 }
 
 // Prune performs a pruning round on the environment set described by this
 // Config.
 func (cfg *Config) Prune(c context.Context) error {
         if err := prune(c, cfg, nil); err != nil {
@@ skipping 64 matching lines @@
         if err := filesystem.AbsPath(&cfg.Python); err != nil {
                 return errors.Annotate(err).Reason("could not get absolute path for: %(python)s").
                         D("python", cfg.Python).
                         Err()
         }
         logging.Debugf(c, "Resolved system Python interpreter (%s): %s", s.PythonVersion, cfg.Python)
         return nil
 }
 
 func (cfg *Config) systemInterpreter() *python.Interpreter { return cfg.si }