Merge "Remove --download-cache argument to pip" into R2.22.x

Juniper · Feb 3, 2016 · 3f0751b · 3f0751b
2 parents 6f26f97 + 2305201
commit 3f0751b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/api-lib/tools/install_venv_common.py b/src/api-lib/tools/install_venv_common.py
@@ -106,11 +106,9 @@ def create_virtualenv(self, no_site_packages=True):
             pass
 
     def pip_install(self, find_links, *args):
-        tdir = '/tmp/cache/%s/config_test' %(os.environ.get('USER', 'pip'))
         find_links_str = ' '.join('--find-links file://'+x for x in find_links)
         cmd_array = ['tools/with_venv.sh',
                          'python', '.venv/bin/pip', 'install', 
-                         '--download-cache=%s' %(tdir),
                          '--upgrade']
         for link in find_links:
             cmd_array.extend(['--find-links', 'file://'+link])
@@ -122,7 +120,7 @@ def install_dependencies(self, find_links):
 
         # First things first, make sure our venv has the latest pip and
         # setuptools and pbr
-        self.pip_install(find_links, 'pip<=7.1')
+        self.pip_install(find_links, 'pip>=6.0')
         self.pip_install(find_links, 'setuptools')
         self.pip_install(find_links, 'pbr')
 

diff --git a/src/config/common/tests/tools/install_venv_common.py b/src/config/common/tests/tools/install_venv_common.py
@@ -106,11 +106,9 @@ def create_virtualenv(self, no_site_packages=True):
             pass
 
     def pip_install(self, find_links, *args):
-        tdir = '/tmp/cache/%s/config_test' %(os.environ.get('USER', 'pip'))
         find_links_str = ' '.join('--find-links file://'+x for x in find_links)
         cmd_array = ['%stools/with_venv.sh' %(os.environ.get('tools_path', '')),
                          'python', '.venv/bin/pip', 'install', 
-                         '--download-cache=%s' %(tdir),
                          '--upgrade']
         for link in find_links:
             cmd_array.extend(['--find-links', 'file://'+link])
@@ -122,7 +120,7 @@ def install_dependencies(self, find_links):
 
         # First things first, make sure our venv has the latest pip and
         # setuptools and pbr
-        self.pip_install(find_links, 'pip>=1.4')
+        self.pip_install(find_links, 'pip>=6.0')
         self.pip_install(find_links, 'setuptools')
         self.pip_install(find_links, 'pbr')